IGC intrinsic refactor - new input file format

This change is to support yaml files decoding and replace python files with yaml files which define IGC intrinsics. This simplifies the generator.

Author: krystian-andrzejewski

IGC/GenISAIntrinsics/CMakeLists.txt

@@ -13,12 +13,11 @@ set(IGC_BUILD__PROJ_LABEL__GenISAIntrinsics "${IGC_BUILD__PROJ__GenISAIntrinsics
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
-set(IGC_BUILD__GenISAIntrinsics_GENERATOR_INPUT_MODULES
+set(IGC_BUILD__GenISAIntrinsics_GENERATOR_INPUT_FILES
     "${CMAKE_CURRENT_SOURCE_DIR}/Intrinsic_definitions.py"
     )
 
 set(IGC_BUILD__GenISAIntrinsics_GENERATOR_SCRIPTS
-    "${CMAKE_CURRENT_SOURCE_DIR}/generator/generate_intrinsic_files.py"
     "${CMAKE_CURRENT_SOURCE_DIR}/generator/Intrinsic_definition_objects.py"
     "${CMAKE_CURRENT_SOURCE_DIR}/generator/Intrinsic_definition_translation.py"
     "${CMAKE_CURRENT_SOURCE_DIR}/generator/Intrinsic_generator.py"
@@ -50,11 +49,11 @@ OUTPUT
     ${IGC_BUILD__GenISAIntrinsics_GENERATOR_OUTPUT_SOURCES}
 COMMAND
     ${CMAKE_COMMAND} -E env "PYTHONPATH=${BS_DIR_EXTERNAL_COMPONENTS}/build-tools/python-site-packages"
-        ${PYTHON_EXECUTABLE} generate_intrinsic_files.py
-            "${IGC_BUILD__GenISAIntrinsics_GENERATOR_INPUT_MODULES}" --output ${IGC_OPTION__OUTPUT_DIR}/${IGC_CMAKE_CFG_INTDIR}
+        ${PYTHON_EXECUTABLE} Intrinsic_generator.py
+            "${IGC_BUILD__GenISAIntrinsics_GENERATOR_INPUT_FILES}" --output ${IGC_OPTION__OUTPUT_DIR}/${IGC_CMAKE_CFG_INTDIR}
             $<$<NOT:$<CONFIG:Release>>:"--use_comments">
 DEPENDS
-    ${IGC_BUILD__GenISAIntrinsics_GENERATOR_INPUT_MODULES}
+    ${IGC_BUILD__GenISAIntrinsics_GENERATOR_INPUT_FILES}
     ${IGC_BUILD__GenISAIntrinsics_GENERATOR_SCRIPTS}
     ${IGC_BUILD__GenISAIntrinsics_GENERATOR_TEMPLATES}
 WORKING_DIRECTORY
@@ -67,7 +66,7 @@ DEPENDS
     ${IGC_BUILD__GenISAIntrinsics_GENERATOR_OUTPUT_HEADERS}
     ${IGC_BUILD__GenISAIntrinsics_GENERATOR_OUTPUT_SOURCES}
 SOURCES
-    ${IGC_BUILD__GenISAIntrinsics_GENERATOR_INPUT_MODULES}
+    ${IGC_BUILD__GenISAIntrinsics_GENERATOR_INPUT_FILES}
     ${IGC_BUILD__GenISAIntrinsics_GENERATOR_SCRIPTS}
     ${IGC_BUILD__GenISAIntrinsics_GENERATOR_TEMPLATES}
     )

IGC/GenISAIntrinsics/GenIntrinsicFunctions.cpp

@@ -174,7 +174,7 @@ class IntrinsicFunctionImp : public llvm::Function
             {
             case TypeID::ArgumentReference:
             {
-                uint8_t argIndex = typeDef.m_ArgumentReference.m_Index;
+                uint8_t argIndex = typeDef.m_Reference.m_Index;
                 IGC_ASSERT_MESSAGE(argIndex < overloadedTypes.size(), "Argument reference index must point out one of the overloaded types");
                 pDest = overloadedTypes[argIndex];
                 break;

IGC/GenISAIntrinsics/LlvmTypesMapping.h

@@ -256,11 +256,11 @@ struct TypeDescriptionTraits<TypeID::ArgumentReference>
 };
 
 
-struct ArgumentReferenceType
+struct ReferenceType
 {
     using Traits = TypeDescriptionTraits<TypeID::ArgumentReference>;
 
-    constexpr ArgumentReferenceType(uint8_t index = 0) :
+    constexpr ReferenceType(uint8_t index = 0) :
         m_Index(index)
     {
 
@@ -322,9 +322,9 @@ struct TypeDescription
     {
     }
 
-    constexpr TypeDescription(const ArgumentReferenceType& def) :
+    constexpr TypeDescription(const ReferenceType& def) :
         m_ID(std::decay_t<decltype(def)>::Traits::scTypeID),
-        m_ArgumentReference{ def }
+        m_Reference{ def }
     {
     }
 
@@ -355,7 +355,7 @@ struct TypeDescription
             func(m_Struct);
             break;
         case TypeID::ArgumentReference:
-            func(m_ArgumentReference);
+            func(m_Reference);
             break;
         default:
             break;
@@ -403,7 +403,7 @@ struct TypeDescription
         AnyType m_Any;
         PointerType m_Pointer;
         StructType m_Struct;
-        ArgumentReferenceType m_ArgumentReference;
+        ReferenceType m_Reference;
     };
 
     const TypeID m_ID;
@@ -420,9 +420,9 @@ struct EmptyTypeHolderT
 };
 
 template<uint8_t index>
-struct ArgumentReferenceTypeHolderT
+struct ReferenceTypeHolderT
 {
-    static constexpr TypeDescription scType = ArgumentReferenceType(index);
+    static constexpr TypeDescription scType = ReferenceType(index);
 };
 
 template<typename TypeHolderT = EmptyTypeHolderT>