VMulCAddC-Replaced yaml files with header table #7411

nitheshsrikanth-mcw · 2024-11-04T11:51:19Z

No description provided.

dsharlet · 2024-11-04T18:56:04Z

src/f16-vmulcaddc/f16-vmulcaddc.h

+
+#ifndef XNN_UKERNEL
+#define XNN_UKERNEL(arch_flags, ukernel, row_tile,channel_tile,  datatype) \
+    XNN_UKERNEL_WITH_PARAMS(arch_flags, ukernel,row_tile,channel_tile ,  datatype, void, /*init_params=*/nullptr)


Commas should immediately follow prior value, and then space after comma:

XNN_UKERNEL_WITH_PARAMS(arch_flags, ukernel,row_tile, channel_tile, datatype, void, /*init_params=*/nullptr)

Please fix other instances in this file too (many above and below).

dsharletg · 2024-11-06T20:44:29Z

tools/generate-vmulcaddc-test.py

Same comments as the other PRs

-- 47192e6 by nithesh <nithesh.srikanth@multicorewareinc.com>: VMulCAddC-Replaced yaml files with header table Replaced yaml files with header table for vmulcadd op -- d8dd82d by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- cf7f1c3 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments FUTURE_COPYBARA_INTEGRATE_REVIEW=#7411 from nitheshsrikanth-mcw:xnn_vmulcadd 1f6456a PiperOrigin-RevId: 695565047

dsharlet · 2024-11-12T19:55:37Z

Update kernel declarations?

nitheshsrikanth-mcw · 2024-11-13T15:04:14Z

@dsharlet Thank you for your comment. I did attempt to update the kernel declarations as suggested, but I encountered an issue during the process that I wasn't able to resolve today. I will revisit the task tomorrow and work on resolving it then.

dsharlet · 2024-12-12T06:38:47Z

@nitheshsrikanth-mcw please take a look at the tests, for example:

/home/runner/work/XNNPACK/XNNPACK/src/f16-vmulcaddc/gen/f16-vmulcaddc-c8-minmax-neonfp16arith-2x.c:18:6: error: conflicting types for ‘xnn_f16_vmulcaddc_minmax_ukernel_c8__neonfp16arith_2x’; have ‘void(size_t,  size_t,  const xnn_float16 * restrict,  size_t,  const xnn_float16 * restrict,  xnn_float16 * restrict,  size_t,  const union xnn_f16_minmax_params * restrict)’ {aka ‘void(unsigned int,  unsigned int,  const xnn_float16 * restrict,  unsigned int,  const xnn_float16 * restrict,  xnn_float16 * restrict,  unsigned int,  const union xnn_f16_minmax_params * restrict)’}
   18 | void xnn_f16_vmulcaddc_minmax_ukernel_c8__neonfp16arith_2x(

But they are all failing.

dsharlet · 2024-12-13T01:29:15Z

Why would including next-prime.h in test/vmulcaddc-microkernel-tester.h address a compilation error in a microkernel?

Can you build and run this branch locally, in any configuration?

nitheshsrikanth-mcw · 2024-12-17T14:33:00Z

It's working for x86 now after updating the next prime header (the error was related to it). For ARM, we need to check, and I'll update this soon.

-- fd9d24d by nithesh <nithesh.srikanth@multicorewareinc.com>: VMulCAddC-Replaced yaml files with header table Replaced yaml files with header table for vmulcadd op -- 4fb020d by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- eb27915 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- b06ecd1 by nithesh <nithesh.srikanth@multicorewareinc.com>: Address CI failed checks -- 2fb29c5 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed kernel declarations comment -- a4d5e62 by nithesh <nithesh.srikanth@multicorewareinc.com>: Resolve "illegal instructions" for AVX512F tests -- 76e4518 by nithesh <nithesh.srikanth@multicorewareinc.com>: Add support for build bazel -- a472377 by nithesh <nithesh.srikanth@multicorewareinc.com>: Defined kernel declrations to use all datatype -- e6882d4 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed the merge issue -- 7799d9a by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed the test case issue -- 6a2b4d2 by nithesh <nithesh.srikanth@multicorewareinc.com>: Resolve check fails for ARM Arch FUTURE_COPYBARA_INTEGRATE_REVIEW=#7411 from nitheshsrikanth-mcw:xnn_vmulcadd 6a2b4d2 PiperOrigin-RevId: 707992277

dsharlet · 2024-12-19T22:12:17Z

test/vmulcaddc-microkernel-tester.h

+#define XNN_TEST_VMULCADDC_ROW_DIV(ukernel, arch_flags, row_tile_, channel_tile_, datatype, params_type, init_params)  \
+  TEST(ukernel, ROW_div)                                                                                               \
+  {                                                                                                                    \
+    for (size_t rows_ = row_tile_ * 2; rows_ <= row_tile_ * 4; rows_ += row_tile_) {                                   \


This is missing TEST_REQUIRES_ARCH_FLAGS(arch_flags) in all tests.

-- fd9d24d by nithesh <nithesh.srikanth@multicorewareinc.com>: VMulCAddC-Replaced yaml files with header table Replaced yaml files with header table for vmulcadd op -- 4fb020d by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- eb27915 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- b06ecd1 by nithesh <nithesh.srikanth@multicorewareinc.com>: Address CI failed checks -- 2fb29c5 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed kernel declarations comment -- a4d5e62 by nithesh <nithesh.srikanth@multicorewareinc.com>: Resolve "illegal instructions" for AVX512F tests -- 76e4518 by nithesh <nithesh.srikanth@multicorewareinc.com>: Add support for build bazel -- a472377 by nithesh <nithesh.srikanth@multicorewareinc.com>: Defined kernel declrations to use all datatype -- e6882d4 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed the merge issue -- 7799d9a by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed the test case issue -- 6a2b4d2 by nithesh <nithesh.srikanth@multicorewareinc.com>: Resolve check fails for ARM Arch FUTURE_COPYBARA_INTEGRATE_REVIEW=#7411 from nitheshsrikanth-mcw:xnn_vmulcadd 6a2b4d2 PiperOrigin-RevId: 707992277

-- fd9d24d by nithesh <nithesh.srikanth@multicorewareinc.com>: VMulCAddC-Replaced yaml files with header table Replaced yaml files with header table for vmulcadd op -- 4fb020d by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- eb27915 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- b06ecd1 by nithesh <nithesh.srikanth@multicorewareinc.com>: Address CI failed checks -- 2fb29c5 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed kernel declarations comment -- a4d5e62 by nithesh <nithesh.srikanth@multicorewareinc.com>: Resolve "illegal instructions" for AVX512F tests -- 76e4518 by nithesh <nithesh.srikanth@multicorewareinc.com>: Add support for build bazel -- a472377 by nithesh <nithesh.srikanth@multicorewareinc.com>: Defined kernel declrations to use all datatype -- e6882d4 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed the merge issue -- 7799d9a by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed the test case issue -- a4370dc by nithesh <nithesh.srikanth@multicorewareinc.com>: Resolve check fails for ARM Arch FUTURE_COPYBARA_INTEGRATE_REVIEW=#7411 from nitheshsrikanth-mcw:xnn_vmulcadd a4370dc PiperOrigin-RevId: 707992277

-- fd9d24d by nithesh <nithesh.srikanth@multicorewareinc.com>: VMulCAddC-Replaced yaml files with header table Replaced yaml files with header table for vmulcadd op -- 4fb020d by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- eb27915 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed review comments -- b06ecd1 by nithesh <nithesh.srikanth@multicorewareinc.com>: Address CI failed checks -- 2fb29c5 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed kernel declarations comment -- a4d5e62 by nithesh <nithesh.srikanth@multicorewareinc.com>: Resolve "illegal instructions" for AVX512F tests -- 76e4518 by nithesh <nithesh.srikanth@multicorewareinc.com>: Add support for build bazel -- a472377 by nithesh <nithesh.srikanth@multicorewareinc.com>: Defined kernel declrations to use all datatype -- e6882d4 by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed the merge issue -- 7799d9a by nithesh <nithesh.srikanth@multicorewareinc.com>: Addressed the test case issue -- 920cc0f by nithesh <nithesh.srikanth@multicorewareinc.com>: Resolve check fails for ARM Arch FUTURE_COPYBARA_INTEGRATE_REVIEW=#7411 from nitheshsrikanth-mcw:xnn_vmulcadd 920cc0f PiperOrigin-RevId: 707992277

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch 2 times, most recently from 8bfc637 to 47192e6 Compare November 4, 2024 14:06

dsharlet reviewed Nov 4, 2024

View reviewed changes

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch 5 times, most recently from 9669c60 to d8dd82d Compare November 5, 2024 15:22

dsharletg reviewed Nov 6, 2024

View reviewed changes

tools/generate-vmulcaddc-test.py Outdated

Copy link

Contributor

dsharletg Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comments as the other PRs

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch from d29eeb2 to c799529 Compare November 7, 2024 12:40

nitheshsrikanth-mcw marked this pull request as draft November 7, 2024 15:07

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch 5 times, most recently from ac65c37 to cf7f1c3 Compare November 8, 2024 10:39

dsharletg approved these changes Nov 8, 2024

View reviewed changes

nitheshsrikanth-mcw marked this pull request as ready for review November 12, 2024 03:35

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch from 1f6456a to 757569f Compare November 12, 2024 09:59

copybara-service bot mentioned this pull request Nov 12, 2024

Copybara import of the project: #7452

Closed

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch 5 times, most recently from 02786a9 to 24e9a1d Compare November 20, 2024 05:33

nitheshsrikanth-mcw added 5 commits December 9, 2024 18:50

Address CI failed checks

b06ecd1

Addressed kernel declarations comment

2fb29c5

Resolve "illegal instructions" for AVX512F tests

a4d5e62

Add support for build bazel

76e4518

Defined kernel declrations to use all datatype

a472377

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch from b490ac6 to a472377 Compare December 9, 2024 13:21

Addressed the merge issue

e6882d4

dsharlet approved these changes Dec 10, 2024

View reviewed changes

Addressed the test case issue

7799d9a

dsharlet approved these changes Dec 17, 2024

View reviewed changes

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch from 05317a9 to c5dd91a Compare December 18, 2024 10:24

dsharlet approved these changes Dec 18, 2024

View reviewed changes

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch from c5dd91a to 6a2b4d2 Compare December 19, 2024 12:21

dsharlet approved these changes Dec 19, 2024

View reviewed changes

copybara-service bot mentioned this pull request Dec 19, 2024

Copybara import of the project: #7623

Merged

dsharlet reviewed Dec 19, 2024

View reviewed changes

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch from 6a2b4d2 to a4370dc Compare December 20, 2024 15:56

Resolve check fails for ARM Arch

920cc0f

nitheshsrikanth-mcw force-pushed the xnn_vmulcadd branch from a4370dc to 920cc0f Compare December 20, 2024 17:06

dsharlet approved these changes Dec 20, 2024

View reviewed changes

copybara-service bot merged commit c134442 into google:master Dec 20, 2024
21 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

VMulCAddC-Replaced yaml files with header table #7411

VMulCAddC-Replaced yaml files with header table #7411

nitheshsrikanth-mcw commented Nov 4, 2024

dsharlet Nov 4, 2024 •

edited

Loading

dsharletg Nov 6, 2024

dsharlet commented Nov 12, 2024

nitheshsrikanth-mcw commented Nov 13, 2024

dsharlet commented Dec 12, 2024

dsharlet commented Dec 13, 2024

nitheshsrikanth-mcw commented Dec 17, 2024

dsharlet Dec 19, 2024

VMulCAddC-Replaced yaml files with header table #7411

VMulCAddC-Replaced yaml files with header table #7411

Conversation

nitheshsrikanth-mcw commented Nov 4, 2024

dsharlet Nov 4, 2024 • edited Loading

Choose a reason for hiding this comment

dsharletg Nov 6, 2024

Choose a reason for hiding this comment

dsharlet commented Nov 12, 2024

nitheshsrikanth-mcw commented Nov 13, 2024

dsharlet commented Dec 12, 2024

dsharlet commented Dec 13, 2024

nitheshsrikanth-mcw commented Dec 17, 2024

dsharlet Dec 19, 2024

Choose a reason for hiding this comment

dsharlet Nov 4, 2024 •

edited

Loading