Make BuiltinInfo::isMuxBuiltinWithBarrierID() into two separate funct…

…ions (#107)
uxlfoundation · Aug 28, 2023 · a5ac5d1 · a5ac5d1
1 parent 89defaa
commit a5ac5d1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/modules/compiler/utils/include/compiler/utils/builtin_info.h b/modules/compiler/utils/include/compiler/utils/builtin_info.h
@@ -444,8 +444,16 @@ class BuiltinInfo {
   /// @brief Returns true if the mux builtin has a barrier ID as its first
   /// operand.
   static bool isMuxBuiltinWithBarrierID(BuiltinID ID) {
-    // NOTE sub group barriers do have an ID operand, but the handle barriers
-    // pass doesn't need to know about that.
+    if (isMuxControlBarrierID(ID)) {
+      return true;
+    }
+    auto Info = isMuxGroupCollective(ID);
+    return Info && Info->isWorkGroupScope();
+  }
+
+  /// @brief Returns true if the mux builtin has a barrier ID as its first
+  /// operand, and applies at Work Group scope.
+  static bool isMuxBuiltinWithWGBarrierID(BuiltinID ID) {
     if (ID == eMuxBuiltinWorkGroupBarrier) {
       return true;
     }

diff --git a/modules/compiler/utils/source/barrier_regions.cpp b/modules/compiler/utils/source/barrier_regions.cpp
@@ -448,7 +448,7 @@ void compiler::utils::Barrier::FindBarriers() {
         Function *callee = call_inst->getCalledFunction();
         if (callee != nullptr) {
           auto const B = bi_->analyzeBuiltin(*callee);
-          if (BuiltinInfo::isMuxBuiltinWithBarrierID(B.ID)) {
+          if (BuiltinInfo::isMuxBuiltinWithWGBarrierID(B.ID)) {
             unsigned id = ~0u;
             auto *const id_param = call_inst->getOperand(0);
             if (auto *const id_param_c = dyn_cast<ConstantInt>(id_param)) {