From 199991cf05ecf4d455e49ed8e3565a4745cfb717 Mon Sep 17 00:00:00 2001 From: "assistant-librarian[bot]" Date: Thu, 25 Dec 2025 01:42:14 +0000 Subject: [PATCH] Merge commit '14668a56e376550cd68d116aa64302a1df05b56f' into develop --- CMakeLists.txt | 16 ---------------- include/ck_tile/core/config.hpp | 4 ---- 2 files changed, 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06d270c16e..eaed7d3509 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,22 +38,6 @@ set(version 1.2.0) project(composable_kernel VERSION ${version} LANGUAGES CXX HIP) include(CTest) -# Set the default value of LLVM_MAIN_REVISION to the equivalent of ROCm7.1.1 release -set(LLVM_MAIN_REVISION 524190) -if (CMAKE_CXX_COMPILER MATCHES "/opt/rocm") - message("compiler in default /opt/rocm/ path") - file(READ "/opt/rocm/llvm/include/llvm/Config/llvm-config.h" HEADER_CONTENT) - string(REGEX MATCH "#define LLVM_MAIN_REVISION[ \t]+([0-9]+)" MATCH_RESULT "${HEADER_CONTENT}") - set(LLVM_MAIN_REVISION ${CMAKE_MATCH_1}) -elseif (CMAKE_CXX_COMPILER MATCHES "/llvm-project/build") - message("compiler in custom /llvm-project/build/ path") - file(READ "/llvm-project/build/include/llvm/Config/llvm-config.h" HEADER_CONTENT) - string(REGEX MATCH "#define LLVM_MAIN_REVISION[ \t]+([0-9]+)" MATCH_RESULT "${HEADER_CONTENT}") - set(LLVM_MAIN_REVISION ${CMAKE_MATCH_1}) -endif() -message("From CMake: LLVM_MAIN_REVISION=${LLVM_MAIN_REVISION}") -add_definitions(-DLLVM_MAIN_REVISION=${LLVM_MAIN_REVISION}) - option(ENABLE_CLANG_CPP_CHECKS "Enables clang tidy, cppcheck" ON) option(MIOPEN_REQ_LIBS_ONLY "Build only the MIOpen required libraries" OFF) option(CK_EXPERIMENTAL_BUILDER "Enable experimental builder" OFF) diff --git a/include/ck_tile/core/config.hpp b/include/ck_tile/core/config.hpp index e737421023..7830749efb 100644 --- a/include/ck_tile/core/config.hpp +++ b/include/ck_tile/core/config.hpp @@ -39,12 +39,8 @@ #define CK_TILE_DEVICE inline __device__ #define CK_TILE_HOST_DEVICE inline __host__ __device__ #define CK_TILE_DEVICE_EXTERN __device__ -#if LLVM_MAIN_REVISION < 554785 #define CK_TILE_HOST_DEVICE_EXTERN __host__ __device__ #else -#define CK_TILE_HOST_DEVICE_EXTERN -#endif -#else #define CK_TILE_HOST inline #define CK_TILE_DEVICE inline #define CK_TILE_HOST_DEVICE inline