Extend LLVMSPIRVOpts.h interface allowing pass options to spirv passes

Author: NikitaRudenkoIntel

llvm-spirv/include/LLVMSPIRVLib.h

@@ -215,6 +215,11 @@ ModulePass *createPreprocessMetadata();
 /// ostream.
 ModulePass *createSPIRVWriterPass(std::ostream &Str);
 
+/// Create and return a pass that writes the module to the specified
+/// ostream.
+ModulePass *createSPIRVWriterPass(std::ostream &Str,
+                                  const SPIRV::TranslatorOpts &Opts);
+
 } // namespace llvm
 
 #endif // SPIRV_H

llvm-spirv/lib/SPIRV/SPIRVWriterPass.cpp

@@ -21,23 +21,26 @@ using namespace llvm;
 PreservedAnalyses SPIRVWriterPass::run(Module &M) {
   // FIXME: at the moment LLVM/SPIR-V translation errors are ignored.
   std::string Err;
-  writeSpirv(&M, OS, Err);
+  writeSpirv(&M, Opts, OS, Err);
   return PreservedAnalyses::all();
 }
 
 namespace {
 class WriteSPIRVPass : public ModulePass {
   std::ostream &OS; // std::ostream to print on
+  SPIRV::TranslatorOpts Opts;
+
 public:
   static char ID; // Pass identification, replacement for typeid
-  explicit WriteSPIRVPass(std::ostream &O) : ModulePass(ID), OS(O) {}
+  WriteSPIRVPass(std::ostream &OS, const SPIRV::TranslatorOpts &Opts)
+      : ModulePass(ID), OS(OS), Opts(Opts) {}
 
   StringRef getPassName() const override { return "SPIRV Writer"; }
 
   bool runOnModule(Module &M) override {
     // FIXME: at the moment LLVM/SPIR-V translation errors are ignored.
     std::string Err;
-    writeSpirv(&M, OS, Err);
+    writeSpirv(&M, Opts, OS, Err);
     return false;
   }
 };
@@ -46,5 +49,14 @@ class WriteSPIRVPass : public ModulePass {
 char WriteSPIRVPass::ID = 0;
 
 ModulePass *llvm::createSPIRVWriterPass(std::ostream &Str) {
-  return new WriteSPIRVPass(Str);
+  SPIRV::TranslatorOpts DefaultOpts;
+  // To preserve old behavior of the translator, let's enable all extensions
+  // by default in this API
+  DefaultOpts.enableAllExtensions();
+  return createSPIRVWriterPass(Str, DefaultOpts);
+}
+
+ModulePass *llvm::createSPIRVWriterPass(std::ostream &Str,
+                                        const SPIRV::TranslatorOpts &Opts) {
+  return new WriteSPIRVPass(Str, Opts);
 }

llvm-spirv/lib/SPIRV/SPIRVWriterPass.h

@@ -15,6 +15,7 @@
 #ifndef SPIRV_SPIRVWRITERPASS_H
 #define SPIRV_SPIRVWRITERPASS_H
 
+#include "LLVMSPIRVOpts.h"
 #include "llvm/ADT/StringRef.h"
 
 namespace llvm {
@@ -27,16 +28,27 @@ class PreservedAnalyses;
 /// manager.
 ModulePass *createSPIRVWriterPass(std::ostream &Str);
 
+/// \brief Create and return a pass that writes the module to the specified
+/// ostream. Note that this pass is designed for use with the legacy pass
+/// manager.
+ModulePass *createSPIRVWriterPass(std::ostream &Str,
+                                  const SPIRV::TranslatorOpts &Opts);
+
 /// \brief Pass for writing a module of IR out to a SPIRV file.
 ///
 /// Note that this is intended for use with the new pass manager. To construct
 /// a pass for the legacy pass manager, use the function above.
 class SPIRVWriterPass {
   std::ostream &OS;
+  SPIRV::TranslatorOpts Opts;
 
 public:
   /// \brief Construct a SPIRV writer pass around a particular output stream.
-  explicit SPIRVWriterPass(std::ostream &OS) : OS(OS) {}
+  explicit SPIRVWriterPass(std::ostream &OS) : OS(OS) {
+    Opts.enableAllExtensions();
+  }
+  SPIRVWriterPass(std::ostream &OS, const SPIRV::TranslatorOpts &Opts)
+      : OS(OS), Opts(Opts) {}
 
   /// \brief Run the SPIRV writer pass, and output the module to the selected
   /// output stream.