Add new mechanism of parsing options for IGC scalar

Use new mechanism based on TableGen to parsing options and internal options for IGC scalar.
intel · Jul 11, 2023 · 29f0166 · 29f0166
1 parent 558f1f0
commit 29f0166
Show file tree

Hide file tree

Showing 11 changed files with 745 additions and 696 deletions.
diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt
@@ -1369,6 +1369,10 @@ include_directories(
  "${IGC_BUILD__IGC_SRC_DIR}/AdaptorOCL/ocl_igc_shared/executable_format"
  "${IGC_BUILD__IGC_SRC_DIR}/AdaptorOCL"
  "${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/ocl_igc_interface/impl"
+
+ "${IGC_BUILD__IGC_SRC_DIR}/Options"
+ "${IGC_BUILD__IGC_SRC_DIR}/Options/include"
+ "${CMAKE_CURRENT_BINARY_DIR}/Options/include"
  )
 
 
@@ -1743,6 +1747,8 @@ foreach(_libBuildSuffix ${IGC_BUILD__MAIN_IGC_LIB_SUFFIXES})
 
 list(APPEND _targetLinkLineCommon zebinlib)
 
+list(APPEND _targetLinkLineCommon IGCOptions)
+
 list(APPEND _targetLinkLineCommon "${IGC_BUILD__PROJ__VISALinkerDriver}")
 
 
@@ -1891,6 +1897,8 @@ if (FCL_ENABLED)
 
  set(_targetLinkLine)
 
+ list(APPEND _targetLinkLine IGCOptions)
+
  # Generated link line for IGC/IGC RS static library allows to properly use it in other projects.
  if(_targetIsStatic)
  list(APPEND _targetLinkLine

diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.cpp b/IGC/Compiler/CISACodeGen/CISABuilder.cpp
@@ -3961,20 +3961,20 @@ namespace IGC
  ForceNonCoherentStatelessBti = ClContext->m_ShouldUseNonCoherentStatelessBTI;
  AllowSpill = !ClContext->m_InternalOptions.NoSpill;
 
- if (ClContext->m_InternalOptions.GTPinReRA)
+ if (ClContext->m_Options.GTPinReRA)
  {
  SaveOption(vISA_GTPinReRA, true);
  SaveOption(vISA_ReRAPostSchedule, true);
  }
- if (ClContext->m_InternalOptions.GTPinGRFInfo)
+ if (ClContext->m_Options.GTPinGRFInfo)
  {
  SaveOption(vISA_GetFreeGRFInfo, true);
  }
- if (ClContext->m_InternalOptions.GTPinScratchAreaSize)
+ if (ClContext->m_Options.GTPinScratchAreaSize)
  {
- SaveOption(vISA_GTPinScratchAreaSize, ClContext->m_InternalOptions.GTPinScratchAreaSizeValue);
+ SaveOption(vISA_GTPinScratchAreaSize, ClContext->m_Options.GTPinScratchAreaSizeValue);
  }
- if (ClContext->m_InternalOptions.GTPinIndirRef)
+ if (ClContext->m_Options.GTPinIndirRef)
  {
  SaveOption(vISA_GTPinGetIndirRef, true);
  }