Port the upstream change to optimize adding decorations

This is to port the upstream change:
KhronosGroup/SPIRV-LLVM-Translator@d56378e. It
will greatly speed up the compilation time when there are lots of
decorations in SPIR-V.

llpc/test/shaderdb/core/OpDecorationGroup_TestGroupAndGroupMember_lit.spvasm

@@ -1,12 +1,12 @@
 ; BEGIN_SHADERTEST
 ; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
-; SHADERTEST: %{{[0-9]+}} = getelementptr <{ [4294967295 x float] }>, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
-; SHADERTEST: %{{[0-9]+}} = getelementptr <{ [4294967295 x float] }>, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
-; SHADERTEST: %{{[0-9]+}} = getelementptr <{ [4294967295 x float] }>, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
-; SHADERTEST: %{{[0-9]+}} = getelementptr <{ [4294967295 x float] }>, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
-; SHADERTEST: %{{[0-9]+}} = getelementptr <{ [4294967295 x float] }>, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
-; SHADERTEST: %{{[0-9]+}} = getelementptr <{ [4294967295 x float] }>, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
+; SHADERTEST: %{{[0-9]+}} = getelementptr { [4294967295 x float] }, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
+; SHADERTEST: %{{[0-9]+}} = getelementptr { [4294967295 x float] }, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
+; SHADERTEST: %{{[0-9]+}} = getelementptr { [4294967295 x float] }, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
+; SHADERTEST: %{{[0-9]+}} = getelementptr { [4294967295 x float] }, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
+; SHADERTEST: %{{[0-9]+}} = getelementptr { [4294967295 x float] }, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
+; SHADERTEST: %{{[0-9]+}} = getelementptr { [4294967295 x float] }, ptr addrspace(7) @{{.*}}, i32 0, i32 0, i32 %{{[0-9]+}}
 ; SHADERTEST: AMDLLPC SUCCESS
 ; END_SHADERTEST
 

llpc/translator/lib/SPIRV/libSPIRV/SPIRVDecorate.cpp

@@ -119,7 +119,7 @@ void SPIRVGroupDecorate::decorateTargets() {
     auto Target = getOrCreate(I);
     for (auto &Dec : DecorationGroup->getDecorations()) {
       assert(Dec->isDecorate());
-      Target->addDecorate(static_cast<const SPIRVDecorate *const>(Dec));
+      Target->addDecorate(static_cast<SPIRVDecorate *const>(Dec));
     }
   }
 }
@@ -164,49 +164,4 @@ void SPIRVDecorateId::decode(std::istream &I) {
   getOrCreateTarget()->addDecorate(this);
 }
 
-bool SPIRVDecorateGeneric::Comparator::operator()(const SPIRVDecorateGeneric *A, const SPIRVDecorateGeneric *B) const {
-  auto Action = [=]() {
-    if (A->getOpCode() < B->getOpCode())
-      return true;
-    if (A->getOpCode() > B->getOpCode())
-      return false;
-    if (A->getDecorateKind() < B->getDecorateKind())
-      return true;
-    if (A->getDecorateKind() > B->getDecorateKind())
-      return false;
-    if (A->getLiteralCount() < B->getLiteralCount())
-      return true;
-    if (A->getLiteralCount() > B->getLiteralCount())
-      return false;
-    for (size_t I = 0, E = A->getLiteralCount(); I != E; ++I) {
-      auto EA = A->getLiteral(I);
-      auto EB = B->getLiteral(I);
-      if (EA < EB)
-        return true;
-      if (EA > EB)
-        return false;
-    }
-    return false;
-  };
-  auto Res = Action();
-  return Res;
-}
-
-bool operator==(const SPIRVDecorateGeneric &A, const SPIRVDecorateGeneric &B) {
-  if (A.getTargetId() != B.getTargetId())
-    return false;
-  if (A.getOpCode() != B.getOpCode())
-    return false;
-  if (A.getDecorateKind() != B.getDecorateKind())
-    return false;
-  if (A.getLiteralCount() != B.getLiteralCount())
-    return false;
-  for (size_t I = 0, E = A.getLiteralCount(); I != E; ++I) {
-    auto EA = A.getLiteral(I);
-    auto EB = B.getLiteral(I);
-    if (EA != EB)
-      return false;
-  }
-  return true;
-}
 } // namespace SPIRV

llpc/translator/lib/SPIRV/libSPIRV/SPIRVDecorate.h

@@ -66,12 +66,6 @@ class SPIRVDecorateGeneric : public SPIRVAnnotationGeneric {
   }
   Decoration getDecorateKind() const;
   size_t getLiteralCount() const;
-  /// Compare for kind and literal only.
-  struct Comparator {
-    bool operator()(const SPIRVDecorateGeneric *A, const SPIRVDecorateGeneric *B) const;
-  };
-  /// Compare kind, literals and target.
-  friend bool operator==(const SPIRVDecorateGeneric &A, const SPIRVDecorateGeneric &B);
 
   SPIRVDecorationGroup *getOwner() const { return Owner; }
 
@@ -96,18 +90,7 @@ class SPIRVDecorateGeneric : public SPIRVAnnotationGeneric {
   SPIRVDecorationGroup *Owner; // Owning decorate group
 };
 
-class SPIRVDecorateSet : public std::multiset<const SPIRVDecorateGeneric *, SPIRVDecorateGeneric::Comparator> {
-public:
-  typedef std::multiset<const SPIRVDecorateGeneric *, SPIRVDecorateGeneric::Comparator> BaseType;
-  iterator insert(const value_type &Dec) {
-    auto ER = BaseType::equal_range(Dec);
-    for (auto I = ER.first, E = ER.second; I != E; ++I) {
-      if (**I == *Dec)
-        return I;
-    }
-    return BaseType::insert(Dec);
-  }
-};
+typedef std::vector<SPIRVDecorateGeneric *> SPIRVDecorateVec;
 
 class SPIRVDecorate : public SPIRVDecorateGeneric {
 public:
@@ -205,23 +188,17 @@ class SPIRVDecorationGroup : public SPIRVEntry {
   SPIRVDecorationGroup() : SPIRVEntry(OC) {}
   _SPIRV_DCL_DECODE
   // Move the given decorates to the decoration group
-  void takeDecorates(SPIRVDecorateSet &Decs) {
-    for (auto &I : Decs) {
-      // Insert decorates whose target ID is this decoration group
-      if (I->getTargetId() == Id) {
-        const_cast<SPIRVDecorateGeneric *>(I)->setOwner(this);
-        Decorations.insert(I);
-      }
-    }
-    // Remove those inserted decorates from original set
+  void takeDecorates(SPIRVDecorateVec &Decs) {
+    Decorations = std::move(Decs);
     for (auto &I : Decorations)
-      Decs.erase(I);
+      const_cast<SPIRVDecorateGeneric *>(I)->setOwner(this);
+    Decs.clear();
   }
 
-  SPIRVDecorateSet &getDecorations() { return Decorations; }
+  SPIRVDecorateVec &getDecorations() { return Decorations; }
 
 protected:
-  SPIRVDecorateSet Decorations;
+  SPIRVDecorateVec Decorations;
   void validate() const override {
     assert(OpCode == OC);
     assert(WordCount == WC);

llpc/translator/lib/SPIRV/libSPIRV/SPIRVEntry.cpp

@@ -201,7 +201,7 @@ void SPIRVEntry::validateBuiltin(SPIRVWord TheSet, SPIRVWord Index) const {
   assert(TheSet != SPIRVWORD_MAX && Index != SPIRVWORD_MAX && "Invalid builtin");
 }
 
-void SPIRVEntry::addDecorate(const SPIRVDecorate *Dec) {
+void SPIRVEntry::addDecorate(SPIRVDecorate *Dec) {
   auto Kind = Dec->getDecorateKind();
   Decorates.insert(std::make_pair(Dec->getDecorateKind(), Dec));
   Module->addDecorate(Dec);
@@ -232,7 +232,7 @@ void SPIRVEntry::setLine(const SPIRVLine *L) {
   Line = L;
 }
 
-void SPIRVEntry::addMemberDecorate(const SPIRVMemberDecorate *Dec) {
+void SPIRVEntry::addMemberDecorate(SPIRVMemberDecorate *Dec) {
   assert(Dec);
   assert(canHaveMemberDecorates());
   MemberDecorates[Dec->getPair()] = Dec;

llpc/translator/lib/SPIRV/libSPIRV/SPIRVEntry.h

@@ -237,11 +237,11 @@ class SPIRVEntry {
     return false;
   }
 
-  void addDecorate(const SPIRVDecorate *);
+  void addDecorate(SPIRVDecorate *);
   void addDecorate(Decoration Kind);
   void addDecorate(Decoration Kind, SPIRVWord Literal);
   void eraseDecorate(Decoration);
-  void addMemberDecorate(const SPIRVMemberDecorate *);
+  void addMemberDecorate(SPIRVMemberDecorate *);
   void addMemberDecorate(SPIRVWord MemberNumber, Decoration Kind);
   void addMemberDecorate(SPIRVWord MemberNumber, Decoration Kind, SPIRVWord Literal);
   void eraseMemberDecorate(SPIRVWord MemberNumber, Decoration Kind);

llpc/translator/lib/SPIRV/libSPIRV/SPIRVModule.cpp

@@ -172,7 +172,7 @@ class SPIRVModuleImpl : public SPIRVModule {
   void setCurrentLine(const SPIRVLine *Line) override;
   void addCapability(SPIRVCapabilityKind) override;
   void addCapabilityInternal(SPIRVCapabilityKind) override;
-  const SPIRVDecorateGeneric *addDecorate(const SPIRVDecorateGeneric *) override;
+  const SPIRVDecorateGeneric *addDecorate(SPIRVDecorateGeneric *) override;
   SPIRVDecorationGroup *addDecorationGroup() override;
   SPIRVDecorationGroup *addDecorationGroup(SPIRVDecorationGroup *Group) override;
   SPIRVGroupDecorate *addGroupDecorate(SPIRVDecorationGroup *Group, const std::vector<SPIRVEntry *> &Targets) override;
@@ -322,7 +322,7 @@ class SPIRVModuleImpl : public SPIRVModule {
   SPIRVStringVec StringVec;
   SPIRVMemberNameVec MemberNameVec;
   const SPIRVLine *CurrentLine;
-  SPIRVDecorateSet DecorateSet;
+  SPIRVDecorateVec DecorateVec;
   SPIRVDecGroupVec DecGroupVec;
   SPIRVGroupDecVec GroupDecVec;
   SPIRVEnetryPointVec EntryPointVec;
@@ -702,12 +702,12 @@ SPIRVBasicBlock *SPIRVModuleImpl::addBasicBlock(SPIRVFunction *Func, SPIRVId Id)
   return Func->addBasicBlock(new SPIRVBasicBlock(getId(Id), Func));
 }
 
-const SPIRVDecorateGeneric *SPIRVModuleImpl::addDecorate(const SPIRVDecorateGeneric *Dec) {
+const SPIRVDecorateGeneric *SPIRVModuleImpl::addDecorate(SPIRVDecorateGeneric *Dec) {
   SPIRVEntry *Target = nullptr;
   assert(exist(Dec->getTargetId(), &Target) && "Decorate target does not exist");
   (void)Target;
   if (!Dec->getOwner())
-    DecorateSet.insert(Dec);
+    DecorateVec.push_back(Dec);
   addCapabilities(Dec->getRequiredCapability());
   return Dec;
 }
@@ -999,12 +999,6 @@ SPIRVInstruction *SPIRVModuleImpl::addVariable(SPIRVType *Type, bool IsConstant,
   return Variable;
 }
 
-template <class T, class B> spv_ostream &operator<<(spv_ostream &O, const std::multiset<T *, B> &V) {
-  for (auto &I : V)
-    O << *I;
-  return O;
-}
-
 template <class T> void SPIRVModuleImpl::addTo(std::vector<T *> &V, SPIRVEntry *E) {
   V.push_back(static_cast<T *>(E));
 }
@@ -1018,7 +1012,7 @@ SPIRVDecorationGroup *SPIRVModuleImpl::addDecorationGroup() {
 
 SPIRVDecorationGroup *SPIRVModuleImpl::addDecorationGroup(SPIRVDecorationGroup *Group) {
   add(Group);
-  Group->takeDecorates(DecorateSet);
+  Group->takeDecorates(DecorateVec);
   DecGroupVec.push_back(Group);
   return Group;
 }

llpc/translator/lib/SPIRV/libSPIRV/SPIRVModule.h

@@ -167,7 +167,7 @@ class SPIRVModule {
   virtual void addUnknownStructField(SPIRVTypeStruct *, unsigned Idx, SPIRVId Id) = 0;
   virtual const SPIRVLine *getCurrentLine() const = 0;
   virtual void setCurrentLine(const SPIRVLine *) = 0;
-  virtual const SPIRVDecorateGeneric *addDecorate(const SPIRVDecorateGeneric *) = 0;
+  virtual const SPIRVDecorateGeneric *addDecorate(SPIRVDecorateGeneric *) = 0;
   virtual SPIRVDecorationGroup *addDecorationGroup() = 0;
   virtual SPIRVDecorationGroup *addDecorationGroup(SPIRVDecorationGroup *Group) = 0;
   virtual SPIRVGroupDecorate *addGroupDecorate(SPIRVDecorationGroup *Group,