Put VC SPIR-V and build options into ZE binary

.

Author: vmustya

IGC/VectorCompiler/igcdeps/include/vc/igcdeps/cmc.h

@@ -126,7 +126,9 @@ class CGen8CMProgram : public iOpenCL::CGen8OpenCLProgramBase {
     bool KernelIsDebuggable = false;
   };
 
-  explicit CGen8CMProgram(PLATFORM platform, const WA_TABLE& WATable);
+  explicit CGen8CMProgram(PLATFORM platform, const WA_TABLE &WATable,
+                          llvm::ArrayRef<char> SPIRV = llvm::None,
+                          llvm::Optional<llvm::StringRef> Opts = llvm::None);
 
   // Produce the final ELF binary with the given CM kernels
   // in OpenCL format.
@@ -148,6 +150,9 @@ class CGen8CMProgram : public iOpenCL::CGen8OpenCLProgramBase {
   std::string m_ErrorLog;
 
 private:
+  llvm::ArrayRef<char> m_spirv;
+  llvm::Optional<llvm::StringRef> m_opts;
+
   TmpFilesStorage extractRawDebugInfo(llvm::raw_ostream &ErrStream);
   std::unique_ptr<llvm::MemoryBuffer> buildZeDebugInfo();
 };

IGC/VectorCompiler/igcdeps/src/PatchTokens.cpp

@@ -27,10 +27,12 @@ struct DebugInfo {
 };
 
 // Implementation of CGen8CMProgram.
-CGen8CMProgram::CGen8CMProgram(PLATFORM platform, const WA_TABLE& WATable)
+CGen8CMProgram::CGen8CMProgram(PLATFORM platform, const WA_TABLE &WATable,
+                               llvm::ArrayRef<char> SPIRV,
+                               llvm::Optional<llvm::StringRef> Opts)
     : CGen8OpenCLProgramBase(platform, m_ContextProvider, WATable),
-      m_programInfo(new IGC::SOpenCLProgramInfo) {}
-
+      m_programInfo(new IGC::SOpenCLProgramInfo), m_spirv(SPIRV), m_opts(Opts) {
+}
 
 TmpFilesStorage
 CGen8CMProgram::extractRawDebugInfo(llvm::raw_ostream &ErrStream) {
@@ -180,8 +182,20 @@ void CGen8CMProgram::GetZEBinary(llvm::raw_pwrite_stream &programBinary,
   // Contains buffer to an optional debug info. Should exists till zebuilder
   // is destroyed.
   std::unique_ptr<llvm::MemoryBuffer> DebugInfoHolder;
-  iOpenCL::ZEBinaryBuilder zebuilder{m_Platform, pointerSizeInBytes == 8,
-                                     *m_programInfo, nullptr, 0, nullptr, 0, nullptr, 0};
+
+  const uint8_t *SpirvData = reinterpret_cast<const uint8_t *>(m_spirv.data());
+  size_t SpirvSize = m_spirv.size();
+
+  const uint8_t *OptsData = nullptr;
+  size_t OptsSize = 0;
+  if (m_opts) {
+    OptsData = reinterpret_cast<const uint8_t *>(m_opts->data());
+    OptsSize = m_opts->size();
+  }
+
+  iOpenCL::ZEBinaryBuilder zebuilder(m_Platform, pointerSizeInBytes == 8,
+                                     *m_programInfo, SpirvData, SpirvSize,
+                                     nullptr, 0, OptsData, OptsSize);
   zebuilder.setGfxCoreFamily(m_Platform.eRenderCoreFamily);
 
   for (const auto &kernel : m_kernels) {

IGC/VectorCompiler/igcdeps/src/TranslationInterface.cpp

@@ -478,6 +478,8 @@ parseOptions(vc::ShaderDumper &Dumper, llvm::StringRef ApiOptions,
     RawInputDumper.release();
     InputDumper.release();
   }
+  if (ExpOptions)
+    ExpOptions->ApiOptions = ApiOptions.str();
   return std::move(ExpOptions);
 }
 
@@ -683,7 +685,8 @@ std::error_code vc::translateBuild(const TC::STB_TranslateInputArgs *InputArgs,
   case vc::BinaryKind::ZE: {
     auto &CompileResult = std::get<vc::ocl::CompileOutput>(Res);
     vc::CGen8CMProgram CMProgram{IGCPlatform.getPlatformInfo(),
-                                 IGCPlatform.getWATable()};
+                                 IGCPlatform.getWATable(), Input,
+                                 llvm::StringRef(Opts.ApiOptions)};
     vc::createBinary(CMProgram, CompileResult);
     llvm::SmallVector<char, 0> ProgramBinary;
     llvm::raw_svector_ostream ProgramBinaryOS{ProgramBinary};

IGC/VectorCompiler/include/vc/Driver/Driver.h

@@ -68,6 +68,8 @@ struct CompileOptions {
   // Optional Shader Overrider
   std::unique_ptr<vc::ShaderOverrider> ShaderOverrider = nullptr;
 
+  std::string ApiOptions;
+
   // Output binary format
   // API options:
   //   -[cl,ze]-enable-zebin