RTStackReflection refactor

RTStackReflection refactor

Author: scottp101

IGC/AdaptorCommon/RayTracing/API/RayDispatchGlobalData.h

@@ -25,7 +25,7 @@ SPDX-License-Identifier: MIT
 // We need to disable the warnings in such way because this C++ file may be compiled with Clang, GCC, and Microsoft
 // Visual Studio Compiler This works around (at least) two known problems:
 //  - QuickBuild treats compiler warnings as errors
-//  - RTStackReflection.exe generates warnings when compiling this file
+//  - IRBuilderGenerator.exe generates warnings when compiling this file
 //
 // The only macros that are used by the main code are:
 //     DISABLE_WARNING_PUSH

IGC/AdaptorCommon/RayTracing/CMakeLists.txt

@@ -6,5 +6,4 @@
 #
 #============================ end_copyright_notice =============================
 
-add_subdirectory(RTStackReflection)
 add_subdirectory(RTStackReflectionIRBG)

IGC/AdaptorCommon/RayTracing/RTBuilder.h

@@ -362,9 +362,9 @@ class RTBuilder : public IGCIRBuilder<> {
 
 
 private:
-#include "AutoGenRTStackAccessPrivate.h"
+#include "AutoGenRTStackReflectionPrivate.h"
 public:
-#include "AutoGenRTStackAccessPublic.h"
+#include "AutoGenRTStackReflectionPublic.h"
 public:
   Type *getSMStack2Ty() const;
   Type *getRTStack2Ty() const;

IGC/AdaptorCommon/RayTracing/RTStackFormat.h

@@ -25,7 +25,7 @@ SPDX-License-Identifier: MIT
 // We need to disable the warnings in such way because this C++ file may be compiled with Clang, GCC, and Microsoft
 // Visual Studio Compiler This works around (at least) two known problems:
 //  - QuickBuild treats compiler warnings as errors
-//  - RTStackReflection.exe generates warnings when compiling this file
+//  - IRBuilderGenerator.exe generates warnings when compiling this file
 //
 // The only macros that are used by the main code are:
 //     DISABLE_WARNING_PUSH

IGC/AdaptorCommon/RayTracing/RTStackReflection/CMakeLists.txt

@@ -6,44 +6,60 @@
 #
 #============================ end_copyright_notice =============================
 
-# Include the RTStackReflection code generation function
-include(RTStackReflectionCodeGen)
+include(IRBuilderGeneratorCodeGen)
 
 # Set up paths
-set(RTSTACK_REFLECTION_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../RTStackReflection)
 set(RT_ROOT_FOLDER ${CMAKE_CURRENT_BINARY_DIR})
 set(RT_SOURCE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/..)
-set(REFLECTION_SOURCE ${RTSTACK_REFLECTION_DIR}/reflection.cpp)
+set(REFLECTION_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/reflection.cpp)
+set(YAML_DESC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Desc.yaml)
+set(IRBUILDER_GENERATOR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../IRBuilderGenerator)
 
 # Set up include directories for clang
 set(RTSTACK_INCLUDE_DIRS
+    ${RT_ROOT_FOLDER}
     ${RT_SOURCE_FOLDER}
+    ${IRBUILDER_GENERATOR_DIR}
 )
 
 # Set up dependencies - the reflection.cpp file and any headers it includes
 set(RTSTACK_DEPENDENCIES
     ${REFLECTION_SOURCE}
+    ${YAML_DESC_PATH}
     # Add any header files that reflection.cpp depends on
 )
 
 # Generate RT Stack reflection headers
-generate_rtstack_reflection_headers(
+generate_irbuilder_headers(
+    NAME RTStackReflection
     SOURCE_FILE ${REFLECTION_SOURCE}
+    YAML_PATH ${YAML_DESC_PATH}
     OUTPUT_DIR ${RT_ROOT_FOLDER}
     INCLUDE_DIRS ${RTSTACK_INCLUDE_DIRS}
     DEPENDS ${RTSTACK_DEPENDENCIES}
 )
 
-# Create an interface library that other targets can depend on
-# The generated headers are added as sources so the custom commands will be triggered
-add_library(RTStackReflectionIRBG INTERFACE
-    ${RTSTACK_GENERATED_HEADERS}
+add_library(RTStackReflectionIRBG STATIC
+    ${GENERATED_HEADERS}
+    ${REFLECTION_SOURCE}
+    ${YAML_DESC_PATH}
+)
+
+# Mark the source files as HEADER_FILE_ONLY so they won't be compiled
+set_source_files_properties(
+    ${GENERATED_HEADERS}
+    ${REFLECTION_SOURCE}
+    ${YAML_DESC_PATH}
+    PROPERTIES HEADER_FILE_ONLY TRUE
 )
 
-# Make the generated headers available to consumers of this library
-target_include_directories(RTStackReflectionIRBG INTERFACE ${RT_ROOT_FOLDER})
+target_include_directories(RTStackReflectionIRBG PUBLIC
+    ${RT_ROOT_FOLDER}
+    ${RT_SOURCE_FOLDER}
+    ${IRBUILDER_GENERATOR_DIR}
+    ${RT_SOURCE_FOLDER}/../common
+)
 
-# Add a dependency on the RTStackReflection tool itself
-add_dependencies(RTStackReflectionIRBG RTStackReflection)
+add_dependencies(RTStackReflectionIRBG IRBuilderGenerator)
 
-set_target_properties(RTStackReflectionIRBG PROPERTIES FOLDER "IGC/Misc")
+set_target_properties(RTStackReflectionIRBG PROPERTIES FOLDER "Misc")

IGC/AdaptorCommon/RayTracing/RTStackReflection/shared.h

@@ -0,0 +1,28 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2025 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
+address_spaces:
+  - name: RTSAS
+    description: RTStack
+    constant: false
+
+  - name: RTGAS
+    description: RTGlobals
+    constant: true
+
+  - name: RTShadowAS
+    description: Shadow Memory
+    constant: false
+
+  - name: SWStackAS
+    description: SWStack
+    constant: false
+
+  - name: SWHotZoneAS
+    description: SWHotZone
+    constant: false