Revert "Encode debug info producer in SPIR-V"

This reverts commit 734e4c4.

Author: vmaksimo

llvm-spirv/lib/SPIRV/LLVMToSPIRVDbgTran.cpp

@@ -478,7 +478,6 @@ LLVMToSPIRVDbgTran::transDbgCompilationUnit(const DICompileUnit *CU) {
   Ops[DWARFVersionIdx] = M->getDwarfVersion();
   Ops[SourceIdx] = getSource(CU)->getId();
   Ops[LanguageIdx] = CU->getSourceLanguage();
-  BM->addModuleProcessed(SPIRVDebug::ProducerPrefix + CU->getProducer().str());
   // Cache CU in a member.
   SPIRVCU = static_cast<SPIRVExtInst *>(
       BM->addDebugInfo(SPIRVDebug::CompilationUnit, getVoidTy(), Ops));

llvm-spirv/lib/SPIRV/SPIRVToLLVMDbgTran.cpp

@@ -130,8 +130,7 @@ SPIRVToLLVMDbgTran::transCompileUnit(const SPIRVExtInst *DebugInst) {
   SPIRVId FileId = Source->getArguments()[SPIRVDebug::Operand::Source::FileIdx];
   std::string File = getString(FileId);
   unsigned SourceLang = Ops[LanguageIdx];
-  auto Producer = findModuleProducer();
-  CU = Builder.createCompileUnit(SourceLang, getDIFile(File), Producer, false,
+  CU = Builder.createCompileUnit(SourceLang, getDIFile(File), "spirv", false,
                                  "", 0);
   return CU;
 }
@@ -1013,16 +1012,6 @@ SPIRVToLLVMDbgTran::SplitFileName::SplitFileName(const string &FileName) {
   }
 }
 
-std::string SPIRVToLLVMDbgTran::findModuleProducer() {
-  for (const auto &I : BM->getModuleProcessedVec()) {
-    if (I->getProcessStr().find(SPIRVDebug::ProducerPrefix) !=
-        std::string::npos) {
-      return I->getProcessStr().substr(SPIRVDebug::ProducerPrefix.size());
-    }
-  }
-  return "spirv";
-}
-
 Optional<DIFile::ChecksumInfo<StringRef>>
 SPIRVToLLVMDbgTran::ParseChecksum(StringRef Text) {
   // Example of "Text" variable:

llvm-spirv/lib/SPIRV/SPIRVToLLVMDbgTran.h

@@ -173,7 +173,6 @@ class SPIRVToLLVMDbgTran {
     return nullptr;
   }
   const std::string &getString(const SPIRVId Id);
-  std::string findModuleProducer();
   Optional<DIFile::ChecksumInfo<StringRef>> ParseChecksum(StringRef Text);
 };
 } // namespace SPIRV

llvm-spirv/lib/SPIRV/libSPIRV/SPIRV.debug.h

@@ -6,7 +6,6 @@
 namespace SPIRVDebug {
 
 const unsigned int DebugInfoVersion = 0x00010000;
-static const std::string ProducerPrefix = {"Debug info producer: "};
 static const std::string ChecksumKindPrefx = {"//__CSK_"};
 
 // clang-format off

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEntry.cpp

@@ -679,20 +679,4 @@ SPIRVType *SPIRVTypeStructContinuedINTEL::getMemberType(size_t I) const {
   return static_cast<SPIRVType *>(SPIRVEntry::getEntry(Elements[I]));
 }
 
-void SPIRVModuleProcessed::validate() const {
-  assert(WordCount == FixedWC + getSizeInWords(ProcessStr) &&
-         "Incorrect word count in OpModuleProcessed");
-}
-
-void SPIRVModuleProcessed::encode(spv_ostream &O) const {
-  getEncoder(O) << ProcessStr;
-}
-
-void SPIRVModuleProcessed::decode(std::istream &I) {
-  getDecoder(I) >> ProcessStr;
-  Module->addModuleProcessed(ProcessStr);
-}
-
-std::string SPIRVModuleProcessed::getProcessStr() { return ProcessStr; }
-
 } // namespace SPIRV

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVEntry.h

@@ -950,27 +950,6 @@ template <> struct InstToContinued<OpSpecConstantComposite> {
   constexpr static spv::Op OpCode = OpSpecConstantCompositeContinuedINTEL;
 };
 
-class SPIRVModuleProcessed : public SPIRVEntryNoId<OpModuleProcessed> {
-public:
-  SPIRVModuleProcessed(SPIRVModule *M, const std::string &Process)
-      : SPIRVEntryNoId(M, FixedWC + getSizeInWords(Process)),
-        ProcessStr(Process) {
-    updateModuleVersion();
-  }
-  SPIRVModuleProcessed() { updateModuleVersion(); }
-  _SPIRV_DCL_ENCDEC
-  void validate() const override;
-  SPIRVWord getRequiredSPIRVVersion() const override {
-    return static_cast<SPIRVWord>(VersionNumber::SPIRV_1_1);
-  }
-
-  std::string getProcessStr();
-
-private:
-  std::string ProcessStr;
-  static const SPIRVWord FixedWC = 1;
-};
-
 // ToDo: The following typedef's are place holders for SPIRV entity classes
 // to be implemented.
 // Each time a new class is implemented, remove the corresponding typedef.

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVModule.cpp

@@ -304,8 +304,6 @@ class SPIRVModuleImpl : public SPIRVModule {
                                SPIRVInstruction * = nullptr) override;
   SPIRVEntry *addDebugInfo(SPIRVWord, SPIRVType *TheType,
                            const std::vector<SPIRVWord> &) override;
-  SPIRVEntry *addModuleProcessed(const std::string &) override;
-  std::vector<SPIRVModuleProcessed *> getModuleProcessedVec() override;
   SPIRVInstruction *addBinaryInst(Op, SPIRVType *, SPIRVValue *, SPIRVValue *,
                                   SPIRVBasicBlock *) override;
   SPIRVInstruction *addCallInst(SPIRVFunction *, const std::vector<SPIRVWord> &,
@@ -516,7 +514,6 @@ class SPIRVModuleImpl : public SPIRVModule {
   std::map<unsigned, SPIRVTypeInt *> IntTypeMap;
   std::map<unsigned, SPIRVConstant *> LiteralMap;
   std::vector<SPIRVExtInst *> DebugInstVec;
-  std::vector<SPIRVModuleProcessed *> ModuleProcessedVec;
 
   void layoutEntry(SPIRVEntry *Entry);
 };
@@ -1286,15 +1283,6 @@ SPIRVEntry *SPIRVModuleImpl::addDebugInfo(SPIRVWord InstId, SPIRVType *TheType,
                        ExtInstSetIds[getDebugInfoEIS()], InstId, Args));
 }
 
-SPIRVEntry *SPIRVModuleImpl::addModuleProcessed(const std::string &Process) {
-  ModuleProcessedVec.push_back(new SPIRVModuleProcessed(this, Process));
-  return ModuleProcessedVec.back();
-}
-
-std::vector<SPIRVModuleProcessed *> SPIRVModuleImpl::getModuleProcessedVec() {
-  return ModuleProcessedVec;
-}
-
 SPIRVInstruction *
 SPIRVModuleImpl::addCallInst(SPIRVFunction *TheFunction,
                              const std::vector<SPIRVWord> &TheArguments,
@@ -1771,8 +1759,8 @@ spv_ostream &operator<<(spv_ostream &O, SPIRVModule &M) {
       M.getEntry(I)->encodeName(O);
   }
 
-  O << MI.MemberNameVec << MI.ModuleProcessedVec << MI.DecGroupVec
-    << MI.DecorateSet << MI.GroupDecVec << MI.ForwardPointerVec
+  O << MI.MemberNameVec << MI.DecGroupVec << MI.DecorateSet << MI.GroupDecVec
+    << MI.ForwardPointerVec
     << TopologicalSort(MI.TypeVec, MI.ConstVec, MI.VariableVec,
                        MI.ForwardPointerVec);
 

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVModule.h

@@ -303,7 +303,6 @@ class SPIRVModule {
                                        SPIRVInstruction * = nullptr) = 0;
   virtual SPIRVEntry *addDebugInfo(SPIRVWord, SPIRVType *,
                                    const std::vector<SPIRVWord> &) = 0;
-  virtual SPIRVEntry *addModuleProcessed(const std::string &) = 0;
   virtual void addCapability(SPIRVCapabilityKind) = 0;
   template <typename T> void addCapabilities(const T &Caps) {
     for (auto I : Caps)
@@ -479,8 +478,6 @@ class SPIRVModule {
     return TranslationOpts.isGenArgNameMDEnabled();
   }
 
-  virtual std::vector<SPIRVModuleProcessed *> getModuleProcessedVec() = 0;
-
   bool getSpecializationConstant(SPIRVWord SpecId, uint64_t &ConstValue) {
     return TranslationOpts.getSpecializationConstant(SpecId, ConstValue);
   }

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVOpCodeEnum.h

@@ -294,7 +294,6 @@ _SPIRV_OP(AtomicFlagClear, 319)
 _SPIRV_OP(TypePipeStorage, 322)
 _SPIRV_OP(ConstantPipeStorage, 323)
 _SPIRV_OP(CreatePipeFromPipeStorage, 324)
-_SPIRV_OP(ModuleProcessed, 330)
 _SPIRV_OP(GroupNonUniformElect, 333)
 _SPIRV_OP(GroupNonUniformAll, 334)
 _SPIRV_OP(GroupNonUniformAny, 335)