Allow detecting SIMD types based on compiler macros #6188

masterleinad · 2023-06-06T19:02:35Z

We have been noticing problems after merging SIMD pull requests that show that our CI support is pretty slim.
This pull request proposes allows Kokkos_ARCH_NATIVE ~~add a CMake option that allows~~ enabling SIMD support macro-based.

masterleinad · 2023-06-13T03:28:51Z

Retest this please.

simd/src/Kokkos_SIMD_AVX512.hpp

simd/src/Kokkos_SIMD_AVX2.hpp

Rombur · 2023-06-14T17:21:18Z

simd/src/Kokkos_SIMD.hpp

 using host_abi_set  = abi_set<simd_abi::scalar, simd_abi::avx512_fixed_size<8>>;
 using data_type_set = data_types<std::int32_t, std::uint32_t, std::int64_t,
                                 std::uint64_t, double>;
-#elif defined(KOKKOS_ARCH_AVX2)
+#elif defined(KOKKOS_ARCH_AVX2) || \
+    (defined(KOKKOS_ENABLE_IMPL_SIMD_NATIVE) && defined(__AVX2__))
 using host_abi_set = abi_set<simd_abi::scalar, simd_abi::avx2_fixed_size<4>>;
 using data_type_set =
    data_types<std::int32_t, std::int64_t, std::uint64_t, double>;


Why does KOKKOS_ENABLE_IMPL_SIMD_NATIVE not work for NEON> (line 162)?

We are already auto-detecting the architecture for NEON. We could discuss if we would hide that behind KOKKOS_ENABLE_IMPL_SIMD_NATIVE or not given that we don't have an explicit architecture option for NEON.

The focus at the moment is on all the changes not related to the new option and I will split the pull request/remove the changes adding testing before merging so that we can review the proposed option separately.

dalg24

Split things up:
Move the fix the host device annotation on simd_mask operations to their own PR. This patch may be a candidate for cherry-picking into the 4.1 RC branch

Make sure you discuss the Impl::{value,mask} friend functions being replaced by impl_* member functions. (Probably belongs to its own PR as well)

simd/unit_tests/TestSIMD.cpp

simd/src/Kokkos_SIMD_AVX512.hpp

simd/src/Kokkos_SIMD_Common.hpp

ibaned · 2023-06-15T15:50:45Z

It's not super clear what this PR does, but I also don't see anything wrong with it

masterleinad · 2023-06-15T17:46:57Z

Depends on #6223.

ajpowelsnl · 2023-07-03T20:05:15Z

@ldh4 , @ndellingwood #6232 is relevant to this issue.

dalg24

It just occurred to me that multiple of these macros might be defined.
What if both __AVX__ and __AVX2__ are defined?
Currently that would define both macros KOKKOS_ARCH_AVX and KOKKOS_ARCH_AVX2 which would never happen before.

masterleinad · 2023-08-29T14:37:13Z

Disabling support for AVX512 when using NVHPC must happen after the new code for ARCH_NATIVE (which might enable it again), see the failures in https://cloud.cees.ornl.gov/jenkins-ci/blue/organizations/jenkins/Kokkos/detail/Kokkos/14078/pipeline:

/usr/bin/ld: CMakeFiles/Kokkos_UnitTest_SIMD.dir/TestSIMD.cpp.o: in function `void host_check_math_op_all_loaders<Kokkos::Experimental::simd_abi::avx512_fixed_size<8>, plus, int, int>(plus, unsigned long, int const*, int const*)':

/var/jenkins/workspace/Kokkos/simd/unit_tests/include/SIMDTesting_Utilities.hpp:122: undefined reference to `__builtin_ia32_kandqi'

/usr/bin/ld: /var/jenkins/workspace/Kokkos/simd/unit_tests/include/SIMDTesting_Utilities.hpp:122: undefined reference to `__builtin_ia32_kandqi'

/usr/bin/ld: CMakeFiles/Kokkos_UnitTest_SIMD.dir/TestSIMD.cpp.o: in function `void host_check_math_op_all_loaders<Kokkos::Experimental::simd_abi::avx512_fixed_size<8>, plus, int, int>(plus, unsigned long, int const*, int const*)':

/var/jenkins/workspace/Kokkos/simd/src/Kokkos_SIMD_AVX512.hpp:72: undefined reference to `__builtin_ia32_kxorqi'

/usr/bin/ld: /var/jenkins/workspace/Kokkos/simd/src/Kokkos_SIMD_AVX512.hpp:72: undefined reference to `__builtin_ia32_kxorqi'
[...]

masterleinad · 2023-08-29T14:48:27Z

Currently that would define both macros KOKKOS_ARCH_AVX and KOKKOS_ARCH_AVX2 which would never happen before.

Right, but we only use these preprocessor definitions in Kokkos_SIMD.hpp and the CI shows that defining multiple of these doesn't cause issues. In fact, it allows users to select more SIMD types than before which should help some with #5677.
I don't think defining multiple of these would cause issues for users. We can of course take a step back and only define one preprocessor definition for more uniformity.

cmake/kokkos_arch.cmake

masterleinad · 2023-08-29T17:02:18Z

I noticed that we didn't set the internal macros when rerunning CMake and the compiler options hadn't changed. The last commit makes sure that we do that now again (like in my initial version).

masterleinad · 2023-08-30T14:59:39Z

Retest this please.

dalg24 · 2023-09-05T21:29:13Z

Retest this please.
Not sure about the ROCm 5.6 failure

dalg24 · 2023-09-06T18:34:38Z


[ 94%] Building CXX object core/unit_test/CMakeFiles/Kokkos_CoreUnitTest_HIP.dir/hip/TestHIP_SubView_c10.cpp.o
fatal error: error in backend: Instruction Combining seems stuck in an infinite loop after 1000 iterations.
clang-16: error: clang frontend command failed with exit code 70 (use -v to see invocation)
AMD clang version 16.0.0 (https://github.com/RadeonOpenCompute/llvm-project roc-5.6.0 23243 be997b2f3651a41597d7a41441fff8ade4ac59ac)
Target: x86_64-unknown-linux-gnu
Thread model: posix
InstalledDir: /opt/rocm-5.6.0/llvm/bin
clang-16: note: diagnostic msg: Error generating preprocessed source(s).
make[2]: *** [simd/unit_tests/CMakeFiles/Kokkos_UnitTest_SIMD.dir/build.make:79: simd/unit_tests/CMakeFiles/Kokkos_UnitTest_SIMD.dir/TestSIMD.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:5168: simd/unit_tests/CMakeFiles/Kokkos_UnitTest_SIMD.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 95%] Building CXX object core/unit_test/CMakeFiles/Kokkos_CoreUnitTest_HIP.dir/hip/TestHIP_SubView_c11.cpp.o

masterleinad · 2023-09-11T19:20:42Z

Not sure about the ROCm 5.6 failure

Let's see if we can get the failure reproduced (and print the detected architecture in that case).

Rombur · 2023-09-12T14:29:46Z

Retest this please

masterleinad · 2023-09-12T20:16:34Z

Looks like the problem with ROCm 5.6.0 not being able to compile the SIMD tests with AVX2 persists. I disabled AVX2 support in that case now as a workaround. Unfortunately, I don't have access to that compiler version to easily debug this further.

masterleinad · 2023-09-18T12:33:22Z

#6449 should be merged first.

…S_AVX2, adn KOKKOS_COMPILER_HAS_AVX

Requested changes were addressed, the respective changes were separated form this pull request.

masterleinad force-pushed the simd_native branch from 636973f to f210fa7 Compare June 8, 2023 13:23

masterleinad closed this Jun 12, 2023

masterleinad reopened this Jun 12, 2023

masterleinad force-pushed the simd_native branch 2 times, most recently from 0260101 to 57a8502 Compare June 13, 2023 18:08

masterleinad marked this pull request as ready for review June 14, 2023 03:22

masterleinad requested a review from ldh4 June 14, 2023 03:22

ldh4 reviewed Jun 14, 2023

View reviewed changes

simd/src/Kokkos_SIMD_AVX512.hpp Outdated Show resolved Hide resolved

masterleinad added this to the Release 4.1 milestone Jun 14, 2023

ldh4 approved these changes Jun 14, 2023

View reviewed changes

ldh4 reviewed Jun 14, 2023

View reviewed changes

simd/src/Kokkos_SIMD_AVX2.hpp Outdated Show resolved Hide resolved

masterleinad force-pushed the simd_native branch from 8ca4b86 to a7b70f4 Compare June 14, 2023 16:17

Rombur reviewed Jun 14, 2023

View reviewed changes

masterleinad requested a review from ibaned June 15, 2023 02:23

dalg24 previously requested changes Jun 15, 2023

View reviewed changes

simd/unit_tests/TestSIMD.cpp Outdated Show resolved Hide resolved

simd/src/Kokkos_SIMD_AVX512.hpp Outdated Show resolved Hide resolved

simd/src/Kokkos_SIMD_Common.hpp Outdated Show resolved Hide resolved

masterleinad force-pushed the simd_native branch from b0ac874 to 19800cb Compare June 15, 2023 13:44

masterleinad mentioned this pull request Jun 15, 2023

Fix SIMD support on GPUs #6223

Merged

masterleinad removed this from the Release 4.1 milestone Jun 15, 2023

masterleinad marked this pull request as draft June 15, 2023 17:47

masterleinad marked this pull request as ready for review June 21, 2023 13:40

masterleinad force-pushed the simd_native branch from 9308fc1 to 59c7edc Compare June 21, 2023 15:19

masterleinad mentioned this pull request Jun 28, 2023

Check AVX, AVX2, AVX512XEON compiler macros on KokkosCore_config.h #6248

Merged

masterleinad requested a review from dalg24 June 29, 2023 20:39

masterleinad force-pushed the simd_native branch from 66dbaa6 to febee80 Compare July 13, 2023 17:48

masterleinad mentioned this pull request Jul 13, 2023

SIMD unit test failures on BDW arch (AVX2) with gcc/9.3.0, 10.2.0 #6277

Closed

masterleinad force-pushed the simd_native branch from 46c8e20 to ba660d3 Compare July 27, 2023 17:14

dalg24 reviewed Aug 29, 2023

View reviewed changes

masterleinad requested a review from dalg24 August 29, 2023 14:34

ldh4 reviewed Aug 29, 2023

View reviewed changes

cmake/kokkos_arch.cmake Show resolved Hide resolved

ldh4 approved these changes Aug 29, 2023

View reviewed changes

masterleinad mentioned this pull request Aug 29, 2023

Add KOKKOS_ARCH_ARM_NEON #6394

Merged

This was referenced Sep 13, 2023

Can't compile SIMD tests with ROCm 5.6.0 and AVX2 #6439

Closed

Workaround for ROCm 5.6+ failing to compile with AVX2 SIMD support #6449

Merged

masterleinad marked this pull request as draft September 18, 2023 12:33

masterleinad added 6 commits September 21, 2023 13:06

Allow detecting SIMD types based on compiler macros

afd9262

Move code disabling AVX512 for NVHPC past check for ARCH_NATIVE again

4f38daa

Only define one out of KOKKOS_COMPILER_HAS_AVX512, KOKKOS_COMPILER_HA…

a6375a3

…S_AVX2, adn KOKKOS_COMPILER_HAS_AVX

Comment on only enabling one of the KOKKOS_ARCH_AVX* macros

d273bb7

Set internal AVX macros even if compiler options haven't changed.

8cadd5f

Print detected architecture at configure time

c3b5037

masterleinad force-pushed the simd_native branch from 3d862f0 to c3b5037 Compare September 21, 2023 17:07

masterleinad marked this pull request as ready for review September 21, 2023 17:07

nliber approved these changes Sep 27, 2023

View reviewed changes

crtrott merged commit 4ce289b into kokkos:develop Oct 4, 2023
28 checks passed

masterleinad mentioned this pull request Oct 11, 2023

CHANGELOG: 4.2.0 #6197

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow detecting SIMD types based on compiler macros #6188

Allow detecting SIMD types based on compiler macros #6188

masterleinad commented Jun 6, 2023 •

edited

masterleinad commented Jun 13, 2023

Rombur Jun 14, 2023

masterleinad Jun 14, 2023

dalg24 left a comment

ibaned commented Jun 15, 2023

masterleinad commented Jun 15, 2023

ajpowelsnl commented Jul 3, 2023

dalg24 left a comment

masterleinad commented Aug 29, 2023

masterleinad commented Aug 29, 2023

masterleinad commented Aug 29, 2023

masterleinad commented Aug 30, 2023

dalg24 commented Sep 5, 2023

dalg24 commented Sep 6, 2023

masterleinad commented Sep 11, 2023

Rombur commented Sep 12, 2023

masterleinad commented Sep 12, 2023

masterleinad commented Sep 18, 2023

Allow detecting SIMD types based on compiler macros #6188

Allow detecting SIMD types based on compiler macros #6188

Conversation

masterleinad commented Jun 6, 2023 • edited

masterleinad commented Jun 13, 2023

Rombur Jun 14, 2023

Choose a reason for hiding this comment

masterleinad Jun 14, 2023

Choose a reason for hiding this comment

dalg24 left a comment

Choose a reason for hiding this comment

ibaned commented Jun 15, 2023

masterleinad commented Jun 15, 2023

ajpowelsnl commented Jul 3, 2023

dalg24 left a comment

Choose a reason for hiding this comment

masterleinad commented Aug 29, 2023

masterleinad commented Aug 29, 2023

masterleinad commented Aug 29, 2023

masterleinad commented Aug 30, 2023

dalg24 commented Sep 5, 2023

dalg24 commented Sep 6, 2023

masterleinad commented Sep 11, 2023

Rombur commented Sep 12, 2023

masterleinad commented Sep 12, 2023

masterleinad commented Sep 18, 2023

masterleinad commented Jun 6, 2023 •

edited