[clang] [Offloading][NFC] Move creation of offloading entries from OpenMP (PR #70116)
via cfe-commits
cfe-commits at lists.llvm.org
Tue Oct 24 13:41:47 PDT 2023
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff c780352de961371949333c3eb0d9d55fda39bf7f 93d72202bc5776483eddb9285ab384979caa85f4 -- llvm/include/llvm/Frontend/Offloading/Utility.h llvm/lib/Frontend/Offloading/Utility.cpp clang/lib/CodeGen/CGCUDANV.cpp llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/lib/CodeGen/CGCUDANV.cpp b/clang/lib/CodeGen/CGCUDANV.cpp
index a8b9c1325731..2ef4dc236d09 100644
--- a/clang/lib/CodeGen/CGCUDANV.cpp
+++ b/clang/lib/CodeGen/CGCUDANV.cpp
@@ -1134,27 +1134,28 @@ void CGNVCUDARuntime::createOffloadingEntries() {
: "cuda_offloading_entries";
llvm::Module &M = CGM.getModule();
for (KernelInfo &I : EmittedKernels)
- llvm::offloading::emitOffloadingEntry(M, KernelHandles[I.Kernel->getName()],
- getDeviceSideName(cast<NamedDecl>(I.D)), 0,
- DeviceVarFlags::OffloadGlobalEntry, Section);
+ llvm::offloading::emitOffloadingEntry(
+ M, KernelHandles[I.Kernel->getName()],
+ getDeviceSideName(cast<NamedDecl>(I.D)), 0,
+ DeviceVarFlags::OffloadGlobalEntry, Section);
for (VarInfo &I : DeviceVars) {
uint64_t VarSize =
CGM.getDataLayout().getTypeAllocSize(I.Var->getValueType());
if (I.Flags.getKind() == DeviceVarFlags::Variable) {
- llvm::offloading::emitOffloadingEntry(M,
- I.Var, getDeviceSideName(I.D), VarSize,
+ llvm::offloading::emitOffloadingEntry(
+ M, I.Var, getDeviceSideName(I.D), VarSize,
I.Flags.isManaged() ? DeviceVarFlags::OffloadGlobalManagedEntry
: DeviceVarFlags::OffloadGlobalEntry,
Section);
} else if (I.Flags.getKind() == DeviceVarFlags::Surface) {
- llvm::offloading::emitOffloadingEntry(M, I.Var, getDeviceSideName(I.D), VarSize,
- DeviceVarFlags::OffloadGlobalSurfaceEntry,
- Section);
+ llvm::offloading::emitOffloadingEntry(
+ M, I.Var, getDeviceSideName(I.D), VarSize,
+ DeviceVarFlags::OffloadGlobalSurfaceEntry, Section);
} else if (I.Flags.getKind() == DeviceVarFlags::Texture) {
- llvm::offloading::emitOffloadingEntry(M, I.Var, getDeviceSideName(I.D), VarSize,
- DeviceVarFlags::OffloadGlobalTextureEntry,
- Section);
+ llvm::offloading::emitOffloadingEntry(
+ M, I.Var, getDeviceSideName(I.D), VarSize,
+ DeviceVarFlags::OffloadGlobalTextureEntry, Section);
}
}
}
diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
index d765d2bd7b14..62c97ff7f292 100644
--- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
+++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
@@ -13,7 +13,6 @@
//===----------------------------------------------------------------------===//
#include "llvm/Frontend/OpenMP/OMPIRBuilder.h"
-#include "llvm/Frontend/Offloading/Utility.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringRef.h"
@@ -24,6 +23,7 @@
#include "llvm/Analysis/ScalarEvolution.h"
#include "llvm/Analysis/TargetLibraryInfo.h"
#include "llvm/Bitcode/BitcodeReader.h"
+#include "llvm/Frontend/Offloading/Utility.h"
#include "llvm/Frontend/OpenMP/OMPGridValues.h"
#include "llvm/IR/Attributes.h"
#include "llvm/IR/BasicBlock.h"
@@ -5891,8 +5891,9 @@ void OpenMPIRBuilder::createOffloadEntry(Constant *ID, Constant *Addr,
GlobalValue::LinkageTypes,
StringRef Name) {
if (!Config.isGPU()) {
- llvm::offloading::emitOffloadingEntry(M, ID, Name.empty() ? Addr->getName()
- : Name, Size, Flags, "omp_offloading_entries");
+ llvm::offloading::emitOffloadingEntry(
+ M, ID, Name.empty() ? Addr->getName() : Name, Size, Flags,
+ "omp_offloading_entries");
return;
}
// TODO: Add support for global variables on the device after declare target
``````````
</details>
https://github.com/llvm/llvm-project/pull/70116
More information about the cfe-commits
mailing list