Auto-derive hctgen target names from mode + output extension

Instead of a special-purpose TARGET_NAME parameter, the CMake target name
is now automatically derived as "${mode}_${extension}" (e.g. DxilCounters_h,
DxilCounters_cpp). This resolves the DxilCounters name conflict between the
.h and .cpp targets without any caller-visible special-casing.

Update the one external reference (DxilIntrinsicTables →
DxilIntrinsicTables_h) in tools/clang/lib/Sema/CMakeLists.txt.

Co-authored-by: damyanp <[email protected]>
Agent-Logs-Url: https://github.com/damyanp/DirectXShaderCompiler/sessions/9de1b168-12bd-407d-b2e7-e83f2480dc9d

Author: Copilot

cmake/modules/HCT.cmake

@@ -38,12 +38,9 @@ endif()
 function(add_hlsl_hctgen mode)
   cmake_parse_arguments(ARG
     "BUILD_DIR;CODE_TAG"
-    "OUTPUT;TARGET_NAME"
+    "OUTPUT"
     ""
     ${ARGN})
-  if (NOT ARG_TARGET_NAME)
-    set(ARG_TARGET_NAME ${mode})
-  endif()
 
   if (NOT ARG_OUTPUT)
     message(FATAL_ERROR "add_hlsl_hctgen requires OUTPUT argument")
@@ -70,6 +67,8 @@ function(add_hlsl_hctgen mode)
                        ${opcodes_json})
 
   get_filename_component(output_extension ${full_output} LAST_EXT)
+  string(SUBSTRING ${output_extension} 1 -1 output_extension_no_dot)
+  set(target_name "${mode}_${output_extension_no_dot}")
 
   if (CLANG_FORMAT_EXE AND output_extension MATCHES "\.h|\.cpp|\.inl")
     set(format_cmd COMMAND ${CLANG_FORMAT_EXE} -i ${temp_output})
@@ -135,8 +134,8 @@ function(add_hlsl_hctgen mode)
                      DEPENDS ${output}
                      COMMENT "Verifying clang-format results...")
 
-  add_custom_target(${ARG_TARGET_NAME}
+  add_custom_target(${target_name}
                     DEPENDS ${temp_output}.stamp)
 
-  add_dependencies(HCTGen ${ARG_TARGET_NAME})
+  add_dependencies(HCTGen ${target_name})
 endfunction()

lib/DXIL/CMakeLists.txt

@@ -2,7 +2,7 @@
 # This file is distributed under the University of Illinois Open Source License.
 # See LICENSE.TXT for details.
 
-add_hlsl_hctgen(DxilCounters OUTPUT DxilCounters.cpp CODE_TAG TARGET_NAME DxilCountersCpp)
+add_hlsl_hctgen(DxilCounters OUTPUT DxilCounters.cpp CODE_TAG)
 add_hlsl_hctgen(DxilOperations OUTPUT DxilOperations.cpp CODE_TAG)
 add_hlsl_hctgen(DxilShaderModel OUTPUT DxilShaderModel.cpp CODE_TAG)
 add_hlsl_hctgen(DxilMetadata OUTPUT DxilMetadataHelper.cpp CODE_TAG)

tools/clang/lib/Sema/CMakeLists.txt

@@ -6,7 +6,7 @@ set(LLVM_LINK_COMPONENTS
 # HLSL Change Begin
 add_hlsl_hctgen(DxilIntrinsicTables BUILD_DIR OUTPUT gen_intrin_main_tables_15.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-list(APPEND LLVM_COMMON_DEPENDS DxilIntrinsicTables)
+list(APPEND LLVM_COMMON_DEPENDS DxilIntrinsicTables_h)
 # HLSL Change End
 
 add_clang_library(clangSema