Author: erichkeane Date: 2025-05-15T16:24:45-07:00 New Revision: 6d7b5c3742165d35100adc1605220b590c93ef89
URL: https://github.com/llvm/llvm-project/commit/6d7b5c3742165d35100adc1605220b590c93ef89 DIFF: https://github.com/llvm/llvm-project/commit/6d7b5c3742165d35100adc1605220b590c93ef89.diff LOG: [OpenACC][CIR] Update tests after #140122 Patch #140122 changed the format of OpenACC 'async', without changing the clang tests. This patch updates the test. Added: Modified: clang/test/CIR/CodeGenOpenACC/data.c clang/test/CIR/CodeGenOpenACC/kernels.c clang/test/CIR/CodeGenOpenACC/parallel.c clang/test/CIR/CodeGenOpenACC/serial.c clang/test/CIR/CodeGenOpenACC/wait.c Removed: ################################################################################ diff --git a/clang/test/CIR/CodeGenOpenACC/data.c b/clang/test/CIR/CodeGenOpenACC/data.c index 7887df6503f08..5c8d32dfd2b73 100644 --- a/clang/test/CIR/CodeGenOpenACC/data.c +++ b/clang/test/CIR/CodeGenOpenACC/data.c @@ -37,9 +37,9 @@ void acc_data(int cond) { #pragma acc data default(none) async {} - // CHECK-NEXT: acc.data { + // CHECK-NEXT: acc.data async { // CHECK-NEXT: acc.terminator - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>], defaultAttr = #acc<defaultvalue none>} + // CHECK-NEXT: } attributes {defaultAttr = #acc<defaultvalue none>} #pragma acc data default(none) async(cond) {} @@ -51,9 +51,9 @@ void acc_data(int cond) { #pragma acc data default(none) async device_type(nvidia, radeon) async {} - // CHECK-NEXT: acc.data { + // CHECK-NEXT: acc.data async([#acc.device_type<none>, #acc.device_type<nvidia>, #acc.device_type<radeon>]) { // CHECK-NEXT: acc.terminator - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>, #acc.device_type<nvidia>, #acc.device_type<radeon>], defaultAttr = #acc<defaultvalue none>} + // CHECK-NEXT: } attributes {defaultAttr = #acc<defaultvalue none>} #pragma acc data default(none) async(3) device_type(nvidia, radeon) async(cond) {} @@ -69,17 +69,17 @@ void acc_data(int cond) { {} // CHECK-NEXT: %[[COND_LOAD:.*]] = cir.load %[[COND]] : !cir.ptr<!s32i>, !s32i // CHECK-NEXT: %[[CONV_CAST:.*]] = builtin.unrealized_conversion_cast %[[COND_LOAD]] : !s32i to si32 - // CHECK-NEXT: acc.data async(%[[CONV_CAST]] : si32 [#acc.device_type<nvidia>], %[[CONV_CAST]] : si32 [#acc.device_type<radeon>]) { + // CHECK-NEXT: acc.data async([#acc.device_type<none>], %[[CONV_CAST]] : si32 [#acc.device_type<nvidia>], %[[CONV_CAST]] : si32 [#acc.device_type<radeon>]) { // CHECK-NEXT: acc.terminator - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>], defaultAttr = #acc<defaultvalue none>} + // CHECK-NEXT: } attributes {defaultAttr = #acc<defaultvalue none>} #pragma acc data default(none) async(3) device_type(nvidia, radeon) async {} // CHECK-NEXT: %[[THREE_LITERAL:.*]] = cir.const #cir.int<3> : !s32i // CHECK-NEXT: %[[THREE_CAST:.*]] = builtin.unrealized_conversion_cast %[[THREE_LITERAL]] : !s32i to si32 - // CHECK-NEXT: acc.data async(%[[THREE_CAST]] : si32) { + // CHECK-NEXT: acc.data async([#acc.device_type<nvidia>, #acc.device_type<radeon>], %[[THREE_CAST]] : si32) { // CHECK-NEXT: acc.terminator - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<nvidia>, #acc.device_type<radeon>], defaultAttr = #acc<defaultvalue none>} + // CHECK-NEXT: } attributes {defaultAttr = #acc<defaultvalue none>} #pragma acc data default(none) if(cond) {} diff --git a/clang/test/CIR/CodeGenOpenACC/kernels.c b/clang/test/CIR/CodeGenOpenACC/kernels.c index 7175e342c39bd..500bec875cf6b 100644 --- a/clang/test/CIR/CodeGenOpenACC/kernels.c +++ b/clang/test/CIR/CodeGenOpenACC/kernels.c @@ -212,9 +212,9 @@ void acc_kernels(int cond) { #pragma acc kernels async {} - // CHECK-NEXT: acc.kernels { + // CHECK-NEXT: acc.kernels async { // CHECK-NEXT: acc.terminator - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>]} + // CHECK-NEXT: } loc #pragma acc kernels async(cond) {} @@ -226,9 +226,9 @@ void acc_kernels(int cond) { #pragma acc kernels async device_type(nvidia, radeon) async {} - // CHECK-NEXT: acc.kernels { + // CHECK-NEXT: acc.kernels async([#acc.device_type<none>, #acc.device_type<nvidia>, #acc.device_type<radeon>]) { // CHECK-NEXT: acc.terminator - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>, #acc.device_type<nvidia>, #acc.device_type<radeon>]} + // CHECK-NEXT: } loc #pragma acc kernels async(3) device_type(nvidia, radeon) async(cond) {} @@ -244,17 +244,17 @@ void acc_kernels(int cond) { {} // CHECK-NEXT: %[[COND_LOAD:.*]] = cir.load %[[COND]] : !cir.ptr<!s32i>, !s32i // CHECK-NEXT: %[[CONV_CAST:.*]] = builtin.unrealized_conversion_cast %[[COND_LOAD]] : !s32i to si32 - // CHECK-NEXT: acc.kernels async(%[[CONV_CAST]] : si32 [#acc.device_type<nvidia>], %[[CONV_CAST]] : si32 [#acc.device_type<radeon>]) { + // CHECK-NEXT: acc.kernels async([#acc.device_type<none>], %[[CONV_CAST]] : si32 [#acc.device_type<nvidia>], %[[CONV_CAST]] : si32 [#acc.device_type<radeon>]) { // CHECK-NEXT: acc.terminator - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>]} + // CHECK-NEXT: } loc #pragma acc kernels async(3) device_type(nvidia, radeon) async {} // CHECK-NEXT: %[[THREE_LITERAL:.*]] = cir.const #cir.int<3> : !s32i // CHECK-NEXT: %[[THREE_CAST:.*]] = builtin.unrealized_conversion_cast %[[THREE_LITERAL]] : !s32i to si32 - // CHECK-NEXT: acc.kernels async(%[[THREE_CAST]] : si32) { + // CHECK-NEXT: acc.kernels async([#acc.device_type<nvidia>, #acc.device_type<radeon>], %[[THREE_CAST]] : si32) { // CHECK-NEXT: acc.terminator - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<nvidia>, #acc.device_type<radeon>]} + // CHECK-NEXT: } loc #pragma acc kernels num_gangs(1) {} diff --git a/clang/test/CIR/CodeGenOpenACC/parallel.c b/clang/test/CIR/CodeGenOpenACC/parallel.c index c9208566bf2b9..54b3cd024123f 100644 --- a/clang/test/CIR/CodeGenOpenACC/parallel.c +++ b/clang/test/CIR/CodeGenOpenACC/parallel.c @@ -211,9 +211,9 @@ void acc_parallel(int cond) { #pragma acc parallel async {} - // CHECK-NEXT: acc.parallel { + // CHECK-NEXT: acc.parallel async { // CHECK-NEXT: acc.yield - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>]} + // CHECK-NEXT: } loc #pragma acc parallel async(cond) {} @@ -225,9 +225,9 @@ void acc_parallel(int cond) { #pragma acc parallel async device_type(nvidia, radeon) async {} - // CHECK-NEXT: acc.parallel { + // CHECK-NEXT: acc.parallel async([#acc.device_type<none>, #acc.device_type<nvidia>, #acc.device_type<radeon>]) { // CHECK-NEXT: acc.yield - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>, #acc.device_type<nvidia>, #acc.device_type<radeon>]} + // CHECK-NEXT: } loc #pragma acc parallel async(3) device_type(nvidia, radeon) async(cond) {} @@ -243,17 +243,17 @@ void acc_parallel(int cond) { {} // CHECK-NEXT: %[[COND_LOAD:.*]] = cir.load %[[COND]] : !cir.ptr<!s32i>, !s32i // CHECK-NEXT: %[[CONV_CAST:.*]] = builtin.unrealized_conversion_cast %[[COND_LOAD]] : !s32i to si32 - // CHECK-NEXT: acc.parallel async(%[[CONV_CAST]] : si32 [#acc.device_type<nvidia>], %[[CONV_CAST]] : si32 [#acc.device_type<radeon>]) { + // CHECK-NEXT: acc.parallel async([#acc.device_type<none>], %[[CONV_CAST]] : si32 [#acc.device_type<nvidia>], %[[CONV_CAST]] : si32 [#acc.device_type<radeon>]) { // CHECK-NEXT: acc.yield - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>]} + // CHECK-NEXT: } loc #pragma acc parallel async(3) device_type(nvidia, radeon) async {} // CHECK-NEXT: %[[THREE_LITERAL:.*]] = cir.const #cir.int<3> : !s32i // CHECK-NEXT: %[[THREE_CAST:.*]] = builtin.unrealized_conversion_cast %[[THREE_LITERAL]] : !s32i to si32 - // CHECK-NEXT: acc.parallel async(%[[THREE_CAST]] : si32) { + // CHECK-NEXT: acc.parallel async([#acc.device_type<nvidia>, #acc.device_type<radeon>], %[[THREE_CAST]] : si32) { // CHECK-NEXT: acc.yield - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<nvidia>, #acc.device_type<radeon>]} + // CHECK-NEXT: } loc #pragma acc parallel num_gangs(1) {} diff --git a/clang/test/CIR/CodeGenOpenACC/serial.c b/clang/test/CIR/CodeGenOpenACC/serial.c index 88a49a95f87d7..90756b04d8f52 100644 --- a/clang/test/CIR/CodeGenOpenACC/serial.c +++ b/clang/test/CIR/CodeGenOpenACC/serial.c @@ -108,9 +108,9 @@ void acc_serial(int cond) { #pragma acc serial async {} - // CHECK-NEXT: acc.serial { + // CHECK-NEXT: acc.serial async { // CHECK-NEXT: acc.yield - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>]} + // CHECK-NEXT: } loc #pragma acc serial async(cond) {} @@ -122,9 +122,9 @@ void acc_serial(int cond) { #pragma acc serial async device_type(nvidia, radeon) async {} - // CHECK-NEXT: acc.serial { + // CHECK-NEXT: acc.serial async([#acc.device_type<none>, #acc.device_type<nvidia>, #acc.device_type<radeon>]) { // CHECK-NEXT: acc.yield - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>, #acc.device_type<nvidia>, #acc.device_type<radeon>]} + // CHECK-NEXT: } loc #pragma acc serial async(3) device_type(nvidia, radeon) async(cond) {} @@ -140,17 +140,17 @@ void acc_serial(int cond) { {} // CHECK-NEXT: %[[COND_LOAD:.*]] = cir.load %[[COND]] : !cir.ptr<!s32i>, !s32i // CHECK-NEXT: %[[CONV_CAST:.*]] = builtin.unrealized_conversion_cast %[[COND_LOAD]] : !s32i to si32 - // CHECK-NEXT: acc.serial async(%[[CONV_CAST]] : si32 [#acc.device_type<nvidia>], %[[CONV_CAST]] : si32 [#acc.device_type<radeon>]) { + // CHECK-NEXT: acc.serial async([#acc.device_type<none>], %[[CONV_CAST]] : si32 [#acc.device_type<nvidia>], %[[CONV_CAST]] : si32 [#acc.device_type<radeon>]) { // CHECK-NEXT: acc.yield - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<none>]} + // CHECK-NEXT: } loc #pragma acc serial async(3) device_type(nvidia, radeon) async {} // CHECK-NEXT: %[[THREE_LITERAL:.*]] = cir.const #cir.int<3> : !s32i // CHECK-NEXT: %[[THREE_CAST:.*]] = builtin.unrealized_conversion_cast %[[THREE_LITERAL]] : !s32i to si32 - // CHECK-NEXT: acc.serial async(%[[THREE_CAST]] : si32) { + // CHECK-NEXT: acc.serial async([#acc.device_type<nvidia>, #acc.device_type<radeon>], %[[THREE_CAST]] : si32) { // CHECK-NEXT: acc.yield - // CHECK-NEXT: } attributes {asyncOnly = [#acc.device_type<nvidia>, #acc.device_type<radeon>]} + // CHECK-NEXT: } loc #pragma acc serial wait {} diff --git a/clang/test/CIR/CodeGenOpenACC/wait.c b/clang/test/CIR/CodeGenOpenACC/wait.c index 569846a91ab8a..c8e345d4b9a0e 100644 --- a/clang/test/CIR/CodeGenOpenACC/wait.c +++ b/clang/test/CIR/CodeGenOpenACC/wait.c @@ -15,7 +15,7 @@ void acc_wait(int cond) { // CHECK-NEXT: acc.wait if(%[[CONV_CAST]]) #pragma acc wait async - // CHECK-NEXT: acc.wait attributes {async} + // CHECK-NEXT: acc.wait async loc #pragma acc wait async(cond) // CHECK-NEXT: %[[COND_LOAD:.*]] = cir.load %[[COND]] : !cir.ptr<!s32i>, !s32i @@ -32,7 +32,7 @@ void acc_wait(int cond) { // CHECK-NEXT: %[[ONE_CAST:.*]] = builtin.unrealized_conversion_cast %[[ONE_LITERAL]] : !s32i to si32 // CHECK-NEXT: %[[TWO_LITERAL:.*]] = cir.const #cir.int<2> : !s32i // CHECK-NEXT: %[[TWO_CAST:.*]] = builtin.unrealized_conversion_cast %[[TWO_LITERAL]] : !s32i to si32 - // CHECK-NEXT: acc.wait(%[[ONE_CAST]], %[[TWO_CAST]] : si32, si32) attributes {async} + // CHECK-NEXT: acc.wait(%[[ONE_CAST]], %[[TWO_CAST]] : si32, si32) async loc #pragma acc wait(queues:1) if (cond) @@ -71,7 +71,7 @@ void acc_wait(int cond) { // CHECK-NEXT: %[[TWO_CAST:.*]] = builtin.unrealized_conversion_cast %[[TWO_LITERAL]] : !s32i to si32 // CHECK-NEXT: %[[THREE_LITERAL:.*]] = cir.const #cir.int<3> : !s32i // CHECK-NEXT: %[[THREE_CAST:.*]] = builtin.unrealized_conversion_cast %[[THREE_LITERAL]] : !s32i to si32 - // CHECK-NEXT: acc.wait(%[[TWO_CAST]], %[[THREE_CAST]] : si32, si32) wait_devnum(%[[ONE_CAST]] : si32) attributes {async} + // CHECK-NEXT: acc.wait(%[[TWO_CAST]], %[[THREE_CAST]] : si32, si32) async wait_devnum(%[[ONE_CAST]] : si32) loc // CHECK-NEXT: cir.return } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
