SYCLOptimizeBarriers: handle __spirv_BuiltIn* call instead of __spirv_BuiltIn* global variables

Author: wenju-he

llvm/lib/SYCLLowerIR/SYCLOptimizeBarriers.cpp

@@ -314,6 +314,36 @@ static inline RegionMemScope getBarrierMaxFencedScope(const BarrierDesc &BD) {
   return getBarrierFencedScopeImpl<RegionMemScope::Global>(BD);
 }
 
+static bool isSPIRVBuiltinFunction(const StringRef FName) {
+  return FName == "_Z22__spirv_BuiltInWorkDimv" ||
+         FName == "_Z28__spirv_BuiltInWorkgroupSizei" ||
+         FName == "_Z32__spirv_BuiltInLocalInvocationIdi" ||
+         FName == "_Z33__spirv_BuiltInGlobalInvocationIdi" ||
+         FName == "_Z26__spirv_BuiltInWorkgroupIdi" ||
+         FName == "_Z27__spirv_BuiltInGlobalOffseti" ||
+         FName == "_Z25__spirv_BuiltInGlobalSizei" ||
+         FName == "_Z28__spirv_BuiltInNumWorkgroupsi" ||
+         FName == "_Z30__spirv_BuiltInSubgroupMaxSizev" ||
+         FName == "_Z25__spirv_BuiltInSubgroupIdv" ||
+         FName == "_Z40__spirv_BuiltInSubgroupLocalInvocationIdv" ||
+         FName == "_Z27__spirv_BuiltInSubgroupSizev" ||
+         FName == "_Z27__spirv_BuiltInNumSubgroupsv" ||
+         FName == "_Z35__spirv_BuiltInLocalInvocationIndexv" ||
+         FName == "_Z29__spirv_BuiltInGlobalLinearIdv" ||
+         FName == "_Z36__spirv_BuiltInEnqueuedWorkgroupSizei" ||
+         FName == "_Z35__spirv_BuiltInNumEnqueuedSubgroupsv" ||
+         FName == "_Z40__spirv_BuiltInSubgroupLocalInvocationIdv" ||
+         FName == "_Z29__spirv_BuiltInSubgroupEqMaskv" ||
+         FName == "_Z32__spirv_BuiltInSubgroupEqMaskKHRv" ||
+         FName == "_Z29__spirv_BuiltInSubgroupGeMaskv" ||
+         FName == "_Z32__spirv_BuiltInSubgroupGeMaskKHRv" ||
+         FName == "_Z29__spirv_BuiltInSubgroupGtMaskv" ||
+         FName == "_Z32__spirv_BuiltInSubgroupGtMaskKHRv" ||
+         FName == "_Z29__spirv_BuiltInSubgroupLeMaskv" ||
+         FName == "_Z32__spirv_BuiltInSubgroupLeMaskKHRv" ||
+         FName == "_Z29__spirv_BuiltInSubgroupLtMaskv" ||
+         FName == "_Z32__spirv_BuiltInSubgroupLtMaskKHRv";
+}
 // Classify a single instruction's memory scope. Used to set/update memory
 // scope of a basic block.
 static RegionMemScope classifyMemScope(Instruction *I) {
@@ -323,6 +353,8 @@ static RegionMemScope classifyMemScope(Instruction *I) {
       if (FName == CONTROL_BARRIER || FName == MEMORY_BARRIER ||
           FName == ITT_BARRIER || FName == ITT_RESUME)
         return RegionMemScope::None;
+      if (isSPIRVBuiltinFunction(FName))
+        return RegionMemScope::None;
       if (FName.contains("__spirv_Atomic")) {
         // SPIR-V atomics all have the same signature:
         // arg0 = ptr, arg1 = SPIR-V Scope, arg2 = Semantics

llvm/test/SYCLLowerIR/SYCLOptimizeBarriers/basic-optimizations.ll

@@ -36,6 +36,24 @@ define spir_kernel void @bb_remove_get_id() {
   ret void
 }
 
+define spir_kernel void @bb_remove_get_id_call() {
+; CHECK-LABEL: define spir_kernel void @bb_remove_get_id_call() {
+; CHECK-NEXT:    [[ID1:%.*]] = call spir_func i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 0)
+; CHECK-NEXT:    call void @_Z22__spirv_ControlBarrieriii(i32 noundef 2, i32 noundef 2, i32 noundef 0)
+; CHECK-NEXT:    [[ID2:%.*]] = call spir_func i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 1)
+; CHECK-NEXT:    [[ID3:%.*]] = call spir_func i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 2)
+; CHECK-NEXT:    ret void
+;
+  %id1 = call spir_func i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 0)
+  call void @_Z22__spirv_ControlBarrieriii(i32 noundef 2, i32 noundef 2, i32 noundef 0)
+  %id2 = call spir_func i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 1)
+  call void @_Z22__spirv_ControlBarrieriii(i32 noundef 2, i32 noundef 2, i32 noundef 0)
+  %id3 = call spir_func i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef 2)
+  ret void
+}
+
+declare spir_func i64 @_Z26__spirv_BuiltInWorkgroupIdi(i32 noundef)
+
 define spir_kernel void @bb_private_access() {
 ; CHECK-LABEL: define spir_kernel void @bb_private_access() {
 ; CHECK-NEXT:    [[TMP:%.*]] = alloca i32, align 4