[llvm] 82453e7 - [OpenMP] Add Missing Runtime Call for Globalization Remarks

[Joseph Huber via llvm-commits]

Author: Joseph Huber
Date: 2020-10-01T21:19:53-04:00
New Revision: 82453e759c77941cf2281ade79fb9b945b7e9458

URL: https://github.com/llvm/llvm-project/commit/82453e759c77941cf2281ade79fb9b945b7e9458
DIFF: https://github.com/llvm/llvm-project/commit/82453e759c77941cf2281ade79fb9b945b7e9458.diff

LOG: [OpenMP] Add Missing Runtime Call for Globalization Remarks

Summary:
Add a missing runtime call to perform data globalization checks.

Reviewers: jdoerfert

Subscribers: guansong hiraditya llvm-commits sstefan1 yaxunl

Tags: #LLVM #OpenMP

Differential Revision: https://reviews.llvm.org/D88621

Added: 
    

Modified: 
    llvm/lib/Transforms/IPO/OpenMPOpt.cpp
    llvm/test/Transforms/OpenMP/globalization_remarks.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/IPO/OpenMPOpt.cpp b/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
index d372f108e3d4..f1eb88e5ab34 100644
--- a/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
+++ b/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
@@ -705,24 +705,29 @@ struct OpenMPOpt {
   }
 
   void analysisGlobalization() {
-    auto &RFI =
-        OMPInfoCache.RFIs[OMPRTL___kmpc_data_sharing_coalesced_push_stack];
-
-    auto checkGlobalization = [&](Use &U, Function &Decl) {
-      if (CallInst *CI = getCallIfRegularCall(U, &RFI)) {
-        auto Remark = [&](OptimizationRemarkAnalysis ORA) {
-          return ORA
-                 << "Found thread data sharing on the GPU. "
-                 << "Expect degraded performance due to data globalization.";
-        };
-        emitRemark<OptimizationRemarkAnalysis>(CI, "OpenMPGlobalization",
-                                               Remark);
-      }
+    RuntimeFunction GlobalizationRuntimeIDs[] = {
+        OMPRTL___kmpc_data_sharing_coalesced_push_stack,
+        OMPRTL___kmpc_data_sharing_push_stack};
+
+    for (const auto GlobalizationCallID : GlobalizationRuntimeIDs) {
+      auto &RFI = OMPInfoCache.RFIs[GlobalizationCallID];
+
+      auto CheckGlobalization = [&](Use &U, Function &Decl) {
+        if (CallInst *CI = getCallIfRegularCall(U, &RFI)) {
+          auto Remark = [&](OptimizationRemarkAnalysis ORA) {
+            return ORA
+                   << "Found thread data sharing on the GPU. "
+                   << "Expect degraded performance due to data globalization.";
+          };
+          emitRemark<OptimizationRemarkAnalysis>(CI, "OpenMPGlobalization",
+                                                 Remark);
+        }
 
-      return false;
-    };
+        return false;
+      };
 
-    RFI.foreachUse(SCC, checkGlobalization);
+      RFI.foreachUse(SCC, CheckGlobalization);
+    }
     return;
   }
 

diff  --git a/llvm/test/Transforms/OpenMP/globalization_remarks.ll b/llvm/test/Transforms/OpenMP/globalization_remarks.ll
index 49ad1076f640..77d37736b7f1 100644
--- a/llvm/test/Transforms/OpenMP/globalization_remarks.ll
+++ b/llvm/test/Transforms/OpenMP/globalization_remarks.ll
@@ -59,7 +59,7 @@ entry:
   br i1 %.not, label %.non-spmd, label %.exit
 
 .non-spmd:                                        ; preds = %entry
-  %1 = tail call i8* @__kmpc_data_sharing_coalesced_push_stack(i64 128, i16 0) #4, !dbg !31
+  %1 = tail call i8* @__kmpc_data_sharing_push_stack(i64 128, i16 0) #4, !dbg !31
   %2 = bitcast i8* %1 to %struct._globalized_locals_ty*
   br label %.exit
 
@@ -86,6 +86,8 @@ declare i8 @__kmpc_is_spmd_exec_mode() local_unnamed_addr
 
 declare i8* @__kmpc_data_sharing_coalesced_push_stack(i64, i16) local_unnamed_addr
 
+declare i8* @__kmpc_data_sharing_push_stack(i64, i16) local_unnamed_addr
+
 ; Function Attrs: nounwind readnone
 declare i32 @llvm.nvvm.read.ptx.sreg.tid.x() #1