Move to a more specific cpu name

diehlpk · Feb 5, 2024 · 6220085 · 6220085
1 parent b7d748a
commit 6220085
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmake/KokkosCore_config.h.in b/cmake/KokkosCore_config.h.in
@@ -78,7 +78,7 @@
 #cmakedefine KOKKOS_ARCH_POWER7
 #cmakedefine KOKKOS_ARCH_POWER8
 #cmakedefine KOKKOS_ARCH_POWER9
-#cmakedefine KOKKOS_ARCH_RISCV_MILKV
+#cmakedefine KOKKOS_ARCH_RISCV_SG2042V
 #cmakedefine KOKKOS_ARCH_INTEL_GEN
 #cmakedefine KOKKOS_ARCH_INTEL_DG1
 #cmakedefine KOKKOS_ARCH_INTEL_GEN9

diff --git a/cmake/kokkos_arch.cmake b/cmake/kokkos_arch.cmake
@@ -67,7 +67,7 @@ DECLARE_AND_CHECK_HOST_ARCH(POWER9            "IBM POWER9 CPUs")
 DECLARE_AND_CHECK_HOST_ARCH(ZEN               "AMD Zen architecture")
 DECLARE_AND_CHECK_HOST_ARCH(ZEN2              "AMD Zen2 architecture")
 DECLARE_AND_CHECK_HOST_ARCH(ZEN3              "AMD Zen3 architecture")
-DECLARE_AND_CHECK_HOST_ARCH(RISCV_MILKV       "Milk-V (RISC-V) CPUs")
+DECLARE_AND_CHECK_HOST_ARCH(RISCV_SG2042      "SG2042 (RISC-V) CPUs")
 
 IF(Kokkos_ENABLE_CUDA OR Kokkos_ENABLE_OPENMPTARGET OR Kokkos_ENABLE_OPENACC OR Kokkos_ENABLE_SYCL)
   SET(KOKKOS_SHOW_CUDA_ARCHS ON)
@@ -376,7 +376,7 @@ IF (KOKKOS_ARCH_HSW)
   )
 ENDIF()
 
-IF (KOKKOS_ARCH_RISCV_MILKV)
+IF (KOKKOS_ARCH_RISCV_SG2042)
   IF(NOT (
   (KOKKOS_CXX_COMPILER_ID STREQUAL GNU
     AND KOKKOS_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12)

diff --git a/core/src/impl/Kokkos_Core.cpp b/core/src/impl/Kokkos_Core.cpp
@@ -690,9 +690,9 @@ void pre_initialize_internal(const Kokkos::InitializationSettings& settings) {
 #elif defined(KOKKOS_ARCH_AMD_ZEN3)
   declare_configuration_metadata("architecture", "CPU architecture",
                                  "AMD_ZEN3");
-#elif defined(KOKKOS_ARCH_RISCV_MILKV)
+#elif defined(KOKKOS_ARCH_RISCV_SG2042)
   declare_configuration_metadata("architecture", "CPU architecture", 
-                                 "Milk-V (RISC-V)")
+                                 "SG2042 (RISC-V)")
 #else
   declare_configuration_metadata("architecture", "CPU architecture", "none");
 #endif