Rename EmitLLVUsed flag and remove unnecessary global variable.

Author: TIFitis

llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h

@@ -101,7 +101,7 @@ class OpenMPIRBuilderConfig {
   std::optional<bool> IsGPU;
 
   /// Flag for specifying if LLVMUsed information should be emitted.
-  std::optional<bool> EmitLLVMUsed;
+  std::optional<bool> EmitLLVMUsedMetaInfo;
 
   /// Flag for specifying if offloading is mandatory.
   std::optional<bool> OpenMPOffloadMandatory;
@@ -176,7 +176,7 @@ class OpenMPIRBuilderConfig {
 
   void setIsTargetDevice(bool Value) { IsTargetDevice = Value; }
   void setIsGPU(bool Value) { IsGPU = Value; }
-  void setEmitLLVMUsed(bool Value = true) { EmitLLVMUsed = Value; }
+  void setEmitLLVMUsed(bool Value = true) { EmitLLVMUsedMetaInfo = Value; }
   void setOpenMPOffloadMandatory(bool Value) { OpenMPOffloadMandatory = Value; }
   void setFirstSeparator(StringRef FS) { FirstSeparator = FS; }
   void setSeparator(StringRef S) { Separator = S; }

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

@@ -145,8 +145,6 @@ static bool isValidWorkshareLoopScheduleType(OMPScheduleType SchedType) {
 }
 #endif
 
-Function *GLOBAL_ReductionFunc = nullptr;
-
 static const omp::GV &getGridValue(const Triple &T, Function *Kernel) {
   if (T.isAMDGPU()) {
     StringRef Features =
@@ -795,7 +793,7 @@ void OpenMPIRBuilder::finalize(Function *Fn) {
   if (!OffloadInfoManager.empty())
     createOffloadEntriesAndInfoMetadata(ErrorReportFn);
 
-  if (Config.EmitLLVMUsed) {
+  if (Config.EmitLLVMUsedMetaInfo.value_or(false)) {
     std::vector<WeakTrackingVH> LLVMCompilerUsed = {
         M.getGlobalVariable("__openmp_nvptx_data_transfer_temporary_storage")};
     emitUsed("llvm.compiler.used", LLVMCompilerUsed);
@@ -3338,15 +3336,11 @@ OpenMPIRBuilder::InsertPointTy OpenMPIRBuilder::createReductionsGPU(
   FuncAttrs = FuncAttrs.addFnAttributes(Ctx, AttrBldr);
 
   Function *ReductionFunc = nullptr;
-  if (GLOBAL_ReductionFunc) {
-    ReductionFunc = GLOBAL_ReductionFunc;
-  } else {
-    CodeGenIP = Builder.saveIP();
-    ReductionFunc = createReductionFunction(
-        Builder.GetInsertBlock()->getParent()->getName(), ReductionInfos,
-        ReductionGenCBKind, FuncAttrs);
-    Builder.restoreIP(CodeGenIP);
-  }
+  CodeGenIP = Builder.saveIP();
+  ReductionFunc =
+      createReductionFunction(Builder.GetInsertBlock()->getParent()->getName(),
+                              ReductionInfos, ReductionGenCBKind, FuncAttrs);
+  Builder.restoreIP(CodeGenIP);
 
   // Set the grid value in the config needed for lowering later on
   if (GridValue.has_value())