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 origin/main HEAD --extensions c,h,cpp --
clang/test/OpenMP/target_vtable_omp_indirect_call_lookup.cpp
offload/test/api/omp_indirect_func_basic.c
offload/test/api/omp_indirect_func_struct.c
offload/test/api/omp_virtual_func.cpp
offload/test/api/omp_virtual_func_multiple_inheritance_01.cpp
offload/test/api/omp_virtual_func_multiple_inheritance_02.cpp
offload/test/api/omp_virtual_func_reference.cpp clang/lib/CodeGen/CGExpr.cpp
clang/lib/CodeGen/CGOpenMPRuntime.cpp clang/lib/CodeGen/CGVTables.cpp
clang/lib/CodeGen/CGVTables.h clang/lib/CodeGen/ItaniumCXXABI.cpp
llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp offload/test/api/omp_indirect_call.c
openmp/device/src/Misc.cpp --diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index 92c0e7785..4d627b9ed 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -6374,7 +6374,7 @@ void CGOpenMPRuntime::emitTargetOutlinedFunctionHelper(
if (LangOpts.OpenMPIsTargetDevice) {
// Search AST for target "CallExpr"s of "OMPTargetAutoLookup".
OMPTargetCallCollector Visitor(CGF, CGF.CGM.OMPTargetCalls);
- Visitor.TraverseStmt(const_cast<Stmt*>(CS.getCapturedStmt()));
+ Visitor.TraverseStmt(const_cast<Stmt *>(CS.getCapturedStmt()));
}
CGOpenMPTargetRegionInfo CGInfo(CS, CodeGen, EntryFnName);
diff --git a/clang/lib/CodeGen/ItaniumCXXABI.cpp
b/clang/lib/CodeGen/ItaniumCXXABI.cpp
index c9bc086da..d5430d4e3 100644
--- a/clang/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/clang/lib/CodeGen/ItaniumCXXABI.cpp
@@ -2271,9 +2271,10 @@ CGCallee
ItaniumCXXABI::getVirtualFunctionPointer(CodeGenFunction &CGF,
llvm::Type *PtrTy = CGM.GlobalsInt8PtrTy;
auto *MethodDecl = cast<CXXMethodDecl>(GD.getDecl());
llvm::Value *VTable = CGF.GetVTablePtr(This, PtrTy, MethodDecl->getParent());
-
- // For the translation of virtual functions, we need to map the (potential)
host
- // vtable to the device vtable. This is done by calling the runtime function
+
+ // For the translation of virtual functions, we need to map the (potential)
+ // host vtable to the device vtable. This is done by calling the runtime
+ // function
// __kmpc_omp_indirect_call_lookup.
if (CGM.getLangOpts().OpenMPIsTargetDevice) {
auto *NewPtrTy = CGM.VoidPtrTy;
diff --git a/offload/test/api/omp_indirect_func_struct.c
b/offload/test/api/omp_indirect_func_struct.c
index cc2eeb86a..a21d7d349 100644
--- a/offload/test/api/omp_indirect_func_struct.c
+++ b/offload/test/api/omp_indirect_func_struct.c
@@ -1,73 +1,101 @@
// RUN: %libomptarget-compile-run-and-check-generic
+#include <assert.h>
#include <omp.h>
#include <stdio.h>
-#include <assert.h>
#define TEST_VAL 5
#pragma omp declare target indirect
-__attribute__((noinline)) __attribute__((optnone)) int direct_arg(int x) {
return 2 * x; }
-__attribute__((noinline)) __attribute__((optnone)) int indirect_base_arg(int
x) { return -1 * x; }
-__attribute__((noinline)) __attribute__((optnone)) int direct() { return
TEST_VAL; }
-__attribute__((noinline)) __attribute__((optnone)) int indirect_base() {
return -1 * TEST_VAL; }
+__attribute__((noinline)) __attribute__((optnone)) int direct_arg(int x) {
+ return 2 * x;
+}
+__attribute__((noinline)) __attribute__((optnone)) int
+indirect_base_arg(int x) {
+ return -1 * x;
+}
+__attribute__((noinline)) __attribute__((optnone)) int direct() {
+ return TEST_VAL;
+}
+__attribute__((noinline)) __attribute__((optnone)) int indirect_base() {
+ return -1 * TEST_VAL;
+}
#pragma omp end declare target
struct indirect_stru {
int buffer;
int (*indirect1)();
- int (*indirect0)(int);
+ int (*indirect0)(int);
};
typedef struct {
int buffer;
int (*indirect1_ptr)();
- int (*indirect0_ptr)(int);
+ int (*indirect0_ptr)(int);
} indirect_stru_mapped;
-#pragma omp declare mapper (indirect_stru_mapped s)
map(s,s.indirect0_ptr,s.indirect1_ptr)
+#pragma omp declare mapper(indirect_stru_mapped s)
\
+ map(s, s.indirect0_ptr, s.indirect1_ptr)
-struct indirect_stru global_indirect_val = { .indirect0 = indirect_base_arg,
.indirect1 = indirect_base};
-indirect_stru_mapped global_mapped_val = { .indirect0_ptr = indirect_base_arg,
.indirect1_ptr = indirect_base};
+struct indirect_stru global_indirect_val = {.indirect0 = indirect_base_arg,
+ .indirect1 = indirect_base};
+indirect_stru_mapped global_mapped_val = {.indirect0_ptr = indirect_base_arg,
+ .indirect1_ptr = indirect_base};
void test_global_struct_explicit_mapping() {
int indirect0_ret = global_indirect_val.indirect0(TEST_VAL);
int indirect0_base = indirect_base_arg(TEST_VAL);
-
+
int indirect1_ret = global_indirect_val.indirect1();
int indirect1_base = indirect_base();
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on host");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on host");
+ assert(indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on host");
+ assert(indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on host");
- #pragma omp target
map(global_indirect_val,global_indirect_val.indirect1,global_indirect_val.indirect0)
map(from:indirect0_ret,indirect1_ret)
+#pragma omp target map(global_indirect_val, global_indirect_val.indirect1,
\
+ global_indirect_val.indirect0)
\
+ map(from : indirect0_ret, indirect1_ret)
{
indirect0_ret = global_indirect_val.indirect0(TEST_VAL);
indirect1_ret = global_indirect_val.indirect1();
}
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on device");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on device");
+ assert(
+ indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on device");
+ assert(
+ indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on device");
global_indirect_val.indirect0 = direct_arg;
global_indirect_val.indirect1 = direct;
indirect0_ret = global_indirect_val.indirect0(TEST_VAL);
indirect0_base = direct_arg(TEST_VAL);
-
+
indirect1_ret = global_indirect_val.indirect1();
indirect1_base = direct();
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on host");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on host");
-
- #pragma omp target
map(global_indirect_val,global_indirect_val.indirect0,global_indirect_val.indirect1)
map(from:indirect0_ret,indirect1_ret)
+ assert(indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on host");
+ assert(indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on host");
+
+#pragma omp target map(global_indirect_val, global_indirect_val.indirect0,
\
+ global_indirect_val.indirect1)
\
+ map(from : indirect0_ret, indirect1_ret)
{
indirect0_ret = global_indirect_val.indirect0(TEST_VAL);
indirect1_ret = global_indirect_val.indirect1();
}
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on device");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on device");
+ assert(
+ indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on device");
+ assert(
+ indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on device");
}
void test_local_struct_explicit_mapping() {
@@ -77,42 +105,58 @@ void test_local_struct_explicit_mapping() {
int indirect0_ret = local_indirect_val.indirect0(TEST_VAL);
int indirect0_base = indirect_base_arg(TEST_VAL);
-
+
int indirect1_ret = local_indirect_val.indirect1();
int indirect1_base = indirect_base();
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on host");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on host");
+ assert(indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on host");
+ assert(indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on host");
- #pragma omp target
map(local_indirect_val,local_indirect_val.indirect1,local_indirect_val.indirect0)
map(from:indirect0_ret,indirect1_ret)
+#pragma omp target map(local_indirect_val, local_indirect_val.indirect1,
\
+ local_indirect_val.indirect0)
\
+ map(from : indirect0_ret, indirect1_ret)
{
indirect0_ret = local_indirect_val.indirect0(TEST_VAL);
indirect1_ret = local_indirect_val.indirect1();
}
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on device");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on device");
+ assert(
+ indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on device");
+ assert(
+ indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on device");
local_indirect_val.indirect0 = direct_arg;
local_indirect_val.indirect1 = direct;
indirect0_ret = local_indirect_val.indirect0(TEST_VAL);
indirect0_base = direct_arg(TEST_VAL);
-
+
indirect1_ret = local_indirect_val.indirect1();
indirect1_base = direct();
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on host");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on host");
+ assert(indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on host");
+ assert(indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on host");
- #pragma omp target
map(local_indirect_val,local_indirect_val.indirect0,local_indirect_val.indirect1)
map(from:indirect0_ret,indirect1_ret)
+#pragma omp target map(local_indirect_val, local_indirect_val.indirect0,
\
+ local_indirect_val.indirect1)
\
+ map(from : indirect0_ret, indirect1_ret)
{
indirect0_ret = local_indirect_val.indirect0(TEST_VAL);
indirect1_ret = local_indirect_val.indirect1();
}
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on device");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on device");
+ assert(
+ indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on device");
+ assert(
+ indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on device");
}
void test_global_struct_user_mapper() {
@@ -122,17 +166,23 @@ void test_global_struct_user_mapper() {
int indirect1_ret = global_mapped_val.indirect1_ptr();
int indirect1_base = indirect_base();
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on host");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on host");
+ assert(indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on host");
+ assert(indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on host");
- #pragma omp target map(from:indirect0_ret,indirect1_ret)
+#pragma omp target map(from : indirect0_ret, indirect1_ret)
{
indirect0_ret = global_mapped_val.indirect0_ptr(TEST_VAL);
indirect1_ret = global_mapped_val.indirect1_ptr();
}
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on device");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on device");
+ assert(
+ indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on device");
+ assert(
+ indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on device");
global_mapped_val.indirect0_ptr = direct_arg;
global_mapped_val.indirect1_ptr = direct;
@@ -143,17 +193,23 @@ void test_global_struct_user_mapper() {
indirect1_ret = global_mapped_val.indirect1_ptr();
indirect1_base = direct();
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on host");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on host");
+ assert(indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on host");
+ assert(indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on host");
- #pragma omp target map(from:indirect0_ret,indirect1_ret)
+#pragma omp target map(from : indirect0_ret, indirect1_ret)
{
indirect0_ret = global_mapped_val.indirect0_ptr(TEST_VAL);
indirect1_ret = global_mapped_val.indirect1_ptr();
}
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on device");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on device");
+ assert(
+ indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on device");
+ assert(
+ indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on device");
}
void test_local_struct_user_mapper() {
@@ -167,17 +223,23 @@ void test_local_struct_user_mapper() {
int indirect1_ret = local_mapped_val.indirect1_ptr();
int indirect1_base = indirect_base();
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on host");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on host");
+ assert(indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on host");
+ assert(indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on host");
- #pragma omp target map(from:indirect0_ret,indirect1_ret)
+#pragma omp target map(from : indirect0_ret, indirect1_ret)
{
indirect0_ret = local_mapped_val.indirect0_ptr(TEST_VAL);
indirect1_ret = local_mapped_val.indirect1_ptr();
}
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on device");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on device");
+ assert(
+ indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on device");
+ assert(
+ indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on device");
local_mapped_val.indirect0_ptr = direct_arg;
local_mapped_val.indirect1_ptr = direct;
@@ -188,17 +250,23 @@ void test_local_struct_user_mapper() {
indirect1_ret = local_mapped_val.indirect1_ptr();
indirect1_base = direct();
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on host");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on host");
+ assert(indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on host");
+ assert(indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on host");
- #pragma omp target map(from:indirect0_ret,indirect1_ret)
+#pragma omp target map(from : indirect0_ret, indirect1_ret)
{
indirect0_ret = local_mapped_val.indirect0_ptr(TEST_VAL);
indirect1_ret = local_mapped_val.indirect1_ptr();
}
- assert(indirect0_ret == indirect0_base && "Error: indirect0 function pointer
returned incorrect value on device");
- assert(indirect1_ret == indirect1_base && "Error: indirect1 function pointer
returned incorrect value on device");
+ assert(
+ indirect0_ret == indirect0_base &&
+ "Error: indirect0 function pointer returned incorrect value on device");
+ assert(
+ indirect1_ret == indirect1_base &&
+ "Error: indirect1 function pointer returned incorrect value on device");
}
int main() {
@@ -206,7 +274,7 @@ int main() {
test_local_struct_explicit_mapping();
test_global_struct_user_mapper();
test_local_struct_user_mapper();
-
+
// CHECK: PASS
printf("PASS\n");
return 0;
diff --git a/offload/test/api/omp_virtual_func.cpp
b/offload/test/api/omp_virtual_func.cpp
index 1cfcb6f4d..ba2e9b53b 100644
--- a/offload/test/api/omp_virtual_func.cpp
+++ b/offload/test/api/omp_virtual_func.cpp
@@ -15,7 +15,8 @@ public:
__attribute__((noinline)) __attribute__((optnone)) virtual int bar() {
return 2;
}
- __attribute__((noinline)) __attribute__((optnone)) virtual int
foo_with_arg(int x) {
+ __attribute__((noinline)) __attribute__((optnone)) virtual int
+ foo_with_arg(int x) {
return x;
}
};
@@ -28,7 +29,8 @@ public:
__attribute__((noinline)) __attribute__((optnone)) virtual int bar() {
return 20;
}
- __attribute__((noinline)) __attribute__((optnone)) virtual int
foo_with_arg(int x) {
+ __attribute__((noinline)) __attribute__((optnone)) virtual int
+ foo_with_arg(int x) {
return -x;
}
};
@@ -143,7 +145,8 @@ int test_virtual_reference_implicit() {
}
assert(c_ret == TEST_VAL && "Control Base call failed on gpu (implicit)");
- assert(b_ret == -TEST_VAL && "Reference to derived call failed on gpu
(implicit)");
+ assert(b_ret == -TEST_VAL &&
+ "Reference to derived call failed on gpu (implicit)");
assert(d_ret == -TEST_VAL && "Derived call failed on gpu (implicit)");
return 0;
``````````
</details>
https://github.com/llvm/llvm-project/pull/159857
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
