https://github.com/wenju-he created 
https://github.com/llvm/llvm-project/pull/156789

Our downstream libclc add a few more targets that customizes build_flags and 
opt_flags. Then in each customization block, MACRO_ARCH is defined to be 
${ARCH}.
Hoisting MACRO_ARCH definition out of if-else-end block avoids code 
duplication. This also avoids potential error when MACRO_ARCH definition is 
forgotten, e.g. in https://github.com/intel/llvm/pull/19971.

>From 1244ca83b9d9b1044c4f3e63bc7867a958064cfd Mon Sep 17 00:00:00 2001
From: Wenju He <wenju...@intel.com>
Date: Thu, 4 Sep 2025 04:32:53 +0200
Subject: [PATCH] [NFC][libclc] Set MACRO_ARCH to ${ARCH} uncondionally before
 customizing

Our downstream libclc add a few more targets that customizes build_flags
and opt_flags. Then in each customization block, MACRO_ARCH is defined
to be ${ARCH}.
Hoisting MACRO_ARCH definition out of if-else-end block avoids code
duplication. This also avoids potential error when MACRO_ARCH definition
is forgotten, e.g. in https://github.com/intel/llvm/pull/19971.
---
 libclc/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
index 5c4e12793329c..0faacc27b9c44 100644
--- a/libclc/CMakeLists.txt
+++ b/libclc/CMakeLists.txt
@@ -394,6 +394,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
 
     message( STATUS "  device: ${d} ( ${${d}_aliases} )" )
 
+    set( MACRO_ARCH ${ARCH} )
     if ( ARCH STREQUAL spirv OR ARCH STREQUAL spirv64 )
       set( build_flags -O0 -finline-hint-functions -DCLC_SPIRV )
       set( opt_flags )
@@ -412,7 +413,6 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
     else()
       set( build_flags )
       set( opt_flags -O3 )
-      set( MACRO_ARCH ${ARCH} )
     endif()
 
     set( LIBCLC_ARCH_OBJFILE_DIR "${LIBCLC_OBJFILE_DIR}/${arch_suffix}" )

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to