Fix AVX2 simd support for ZEN2 AMD CPU. (kokkos#6238)

* Fix AVX2 simd support for ZEN2 AMD CPU.

* Update simd/src/Kokkos_SIMD.hpp

Co-authored-by: Damien L-G <dalg24+github@gmail.com>

* Replace KOKKOS_ARCH_AMD_AVX2 with KOKKOS_ARCH_AVX2

---------

Co-authored-by: Damien L-G <dalg24+github@gmail.com>
Co-authored-by: Bruno Turcksin <bruno.turcksin@gmail.com>

Makefile.kokkos

@@ -739,7 +739,7 @@ endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_ARCH_ZEN), 1)
   tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AMD_ZEN")
-  tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AMD_AVX2")
+  tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AVX2")
 
   ifeq ($(KOKKOS_INTERNAL_COMPILER_INTEL), 1)
     KOKKOS_CXXFLAGS += -mavx2
@@ -752,7 +752,7 @@ endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_ARCH_ZEN2), 1)
   tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AMD_ZEN2")
-  tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AMD_AVX2")
+  tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AVX2")
 
   ifeq ($(KOKKOS_INTERNAL_COMPILER_INTEL), 1)
     KOKKOS_CXXFLAGS += -mavx2
@@ -765,7 +765,7 @@ endif
 
 ifeq ($(KOKKOS_INTERNAL_USE_ARCH_ZEN3), 1)
   tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AMD_ZEN3")
-  tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AMD_AVX2")
+  tmp := $(call kokkos_append_header,"$H""define KOKKOS_ARCH_AVX2")
 
   ifeq ($(KOKKOS_INTERNAL_COMPILER_INTEL), 1)
     KOKKOS_CXXFLAGS += -mavx2

cmake/KokkosCore_config.h.in

@@ -69,7 +69,6 @@
 #cmakedefine KOKKOS_ARCH_ARMV81
 #cmakedefine KOKKOS_ARCH_ARMV8_THUNDERX2
 #cmakedefine KOKKOS_ARCH_A64FX
-#cmakedefine KOKKOS_ARCH_AMD_AVX2
 #cmakedefine KOKKOS_ARCH_AVX
 #cmakedefine KOKKOS_ARCH_AVX2
 #cmakedefine KOKKOS_ARCH_AVX512XEON

cmake/kokkos_arch.cmake

@@ -298,7 +298,7 @@ IF (KOKKOS_ARCH_ZEN)
     DEFAULT -march=znver1 -mtune=znver1
   )
   SET(KOKKOS_ARCH_AMD_ZEN  ON)
-  SET(KOKKOS_ARCH_AMD_AVX2 ON)
+  SET(KOKKOS_ARCH_AVX2 ON)
 ENDIF()
 
 IF (KOKKOS_ARCH_ZEN2)
@@ -310,7 +310,7 @@ IF (KOKKOS_ARCH_ZEN2)
     DEFAULT -march=znver2 -mtune=znver2
   )
   SET(KOKKOS_ARCH_AMD_ZEN2 ON)
-  SET(KOKKOS_ARCH_AMD_AVX2 ON)
+  SET(KOKKOS_ARCH_AVX2 ON)
 ENDIF()
 
 IF (KOKKOS_ARCH_ZEN3)
@@ -322,7 +322,7 @@ IF (KOKKOS_ARCH_ZEN3)
     DEFAULT -march=znver3 -mtune=znver3
   )
   SET(KOKKOS_ARCH_AMD_ZEN3 ON)
-  SET(KOKKOS_ARCH_AMD_AVX2 ON)
+  SET(KOKKOS_ARCH_AVX2 ON)
 ENDIF()
 
 IF (KOKKOS_ARCH_WSM)