Aspects order shouldn't matter

Author: AlexeySachkov

llvm/test/tools/sycl-post-link/device-code-split/per-aspect-split-2.ll

@@ -12,13 +12,17 @@
 ; CHECK-TABLE-NEXT: _0.sym
 ; CHECK-TABLE-NEXT: _1.sym
 ; CHECK-TABLE-NEXT: _2.sym
-; CHECK-TABLE-NEXT: _3.sym
 ; CHECK-TABLE-EMPTY:
 
-; CHECK-M0-SYMS: kernel2
-; CHECK-M1-SYMS: kernel3
-; CHECK-M2-SYMS: kernel0
-; CHECK-M3-SYMS: kernel1
+; CHECK-M0-SYMS: kernel3
+; CHECK-M0-SYMS-EMPTY:
+
+; CHECK-M1-SYMS: kernel0
+; CHECK-M1-SYMS-EMPTY:
+
+; CHECK-M2-SYMS: kernel1
+; CHECK-M2-SYMS: kernel2
+; CHECK-M2-SYMS-EMPTY:
 
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
 target triple = "spir64-unknown-linux"

llvm/tools/sycl-post-link/ModuleSplitter.cpp

@@ -767,6 +767,10 @@ namespace {
   //
   // It has extra methods to be useable as a key in llvm::DenseMap.
   struct UsedOptionalFeatures {
+    SmallVector<int, 4> Aspects;
+    // TODO: extend this further with reqd-sub-group-size, reqd-work-group-size,
+    // double-grf and other properties
+
     UsedOptionalFeatures() = default;
 
     UsedOptionalFeatures(const Function *F) {
@@ -779,9 +783,9 @@ namespace {
         };
 
         for (size_t I = 0, E = MDN->getNumOperands(); I < E; ++I) {
-          Aspects.insert(ExtractIntegerFromMDNodeOperand(MDN, I));
+          Aspects.push_back(ExtractIntegerFromMDNodeOperand(MDN, I));
         }
-
+        llvm::sort(Aspects);
       }
 
       llvm::hash_code AspectsHash =
@@ -800,10 +804,6 @@ namespace {
       return Ret;
     }
 
-    SmallSet<int, 4> Aspects;
-    // TODO: extend this further with reqd-sub-group-size, reqd-work-group-size,
-    // double-grf and other properties
-
     static UsedOptionalFeatures getTombstone() {
       UsedOptionalFeatures Ret;
       Ret.IsTombstoneKey = true;
@@ -831,9 +831,10 @@ namespace {
       if (Aspects.size() != Other.Aspects.size())
         return false;
 
-      if (!llvm::all_of(Other.Aspects,
-                        [&](int Aspect) { return Aspects.contains(Aspect); }))
-        return false;
+      for (size_t I = 0, E = Aspects.size(); I != E; ++I) {
+        if (Aspects[I] != Other.Aspects[I])
+          return false;
+      }
 
       return IsEmpty == Other.IsEmpty;
     }