[libclc] Consolidate `amdgpu` and `amdgcn` architectures consistently (#197233) Summary: Currently we did not pass all checks with amdgpu triple as we did with amdgcn. SPIR-V set this pattern so let's make it consistent. GitOrigin-RevId: 9a39c60406638ee8545d432e7f22a5ecd253c24d
diff --git a/CMakeLists.txt b/CMakeLists.txt index 334faa1..e6fdff6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -23,9 +23,10 @@ ) # List of all supported architectures. -set( LIBCLC_ARCHS_ALL amdgpu amdgcn nvptx64 ) +set( LIBCLC_ARCHS_NVPTX nvptx64 ) +set( LIBCLC_ARCHS_AMDGPU amdgpu amdgcn ) set( LIBCLC_ARCHS_SPIRV spirv spirv32 spirv64 ) -list( APPEND LIBCLC_ARCHS_ALL ${LIBCLC_ARCHS_SPIRV} ) +list( APPEND LIBCLC_ARCHS_ALL ${LIBCLC_ARCHS_AMDGPU} ${LIBCLC_ARCHS_NVPTX} ${LIBCLC_ARCHS_SPIRV} ) set(LIBCLC_TARGET ${LLVM_DEFAULT_TARGET_TRIPLE}) @@ -102,9 +103,9 @@ message(STATUS "libclc target '${LIBCLC_TARGET}' is enabled") # Map the LLVM target architecture to the standard directory name. -if(LIBCLC_TARGET_ARCH STREQUAL amdgcn OR LIBCLC_TARGET_ARCH STREQUAL amdgpu) +if(LIBCLC_TARGET_ARCH IN_LIST LIBCLC_ARCHS_AMDGPU) set(LIBCLC_ARCH_DIR amdgpu) -elseif(LIBCLC_TARGET_ARCH STREQUAL nvptx64) +elseif(LIBCLC_TARGET_ARCH IN_LIST LIBCLC_ARCHS_NVPTX) set(LIBCLC_ARCH_DIR nvptx) elseif(LIBCLC_TARGET_ARCH IN_LIST LIBCLC_ARCHS_SPIRV) set(LIBCLC_ARCH_DIR spirv) @@ -138,7 +139,7 @@ # Address space values. set(private_addrspace_val 0) set(generic_addrspace_val 0) -if(LIBCLC_TARGET_ARCH STREQUAL amdgcn) +if(LIBCLC_TARGET_ARCH IN_LIST LIBCLC_ARCHS_AMDGPU) set(private_addrspace_val 5) endif() if(LIBCLC_TARGET_ARCH IN_LIST LIBCLC_ARCHS_SPIRV AND NOT LIBCLC_TARGET_OS STREQUAL vulkan) @@ -158,7 +159,7 @@ list(APPEND target_extra_defines CLC_SPIRV) set(opt_flags) endif() -elseif(LIBCLC_TARGET_ARCH STREQUAL amdgcn) +elseif(LIBCLC_TARGET_ARCH IN_LIST LIBCLC_ARCHS_AMDGPU) list(APPEND target_compile_flags "SHELL:-Xclang -mcode-object-version=none") endif()