Author: erichkeane Date: 2025-03-06T13:16:57-08:00 New Revision: 1493f420600b4a4284a6bb08f1867ecb7bebdcbb
URL: https://github.com/llvm/llvm-project/commit/1493f420600b4a4284a6bb08f1867ecb7bebdcbb DIFF: https://github.com/llvm/llvm-project/commit/1493f420600b4a4284a6bb08f1867ecb7bebdcbb.diff LOG: [OpenACC] Add test changes missed in 7d8da04 Looks like I did a bad job with git and ended up having some failed tests! This should fix those. Added: Modified: clang/test/ParserOpenACC/parse-clauses.c clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c clang/test/SemaOpenACC/combined-construct-device_type-clause.c clang/test/SemaOpenACC/compute-construct-device_type-clause.c clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c clang/test/SemaOpenACC/loop-construct-device_type-clause.c clang/test/SemaOpenACC/routine-construct-clauses.cpp Removed: ################################################################################ diff --git a/clang/test/ParserOpenACC/parse-clauses.c b/clang/test/ParserOpenACC/parse-clauses.c index 6b1bb208704d7..0964ae78216dd 100644 --- a/clang/test/ParserOpenACC/parse-clauses.c +++ b/clang/test/ParserOpenACC/parse-clauses.c @@ -1261,7 +1261,6 @@ void Gang() { } - // expected-warning@+6{{OpenACC clause 'nohost' not yet implemented, clause ignored}} // expected-warning@+5{{OpenACC construct 'routine' with implicit function not yet implemented, pragma ignored}} // expected-error@+4{{OpenACC clause 'seq' may not appear on the same construct as a 'worker' clause on a 'routine' construct}} // expected-note@+3{{previous clause is here}} @@ -1270,7 +1269,6 @@ void Gang() { #pragma acc routine worker, vector, seq, nohost void bar(); - // expected-warning@+5{{OpenACC clause 'nohost' not yet implemented, clause ignored}} // expected-error@+4{{OpenACC clause 'seq' may not appear on the same construct as a 'worker' clause on a 'routine' construct}} // expected-note@+3{{previous clause is here}} // expected-error@+2{{OpenACC clause 'vector' may not appear on the same construct as a 'worker' clause on a 'routine' construct}} diff --git a/clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c b/clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c index bbc40f4b401b2..1cdc657df0460 100644 --- a/clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c +++ b/clang/test/SemaOpenACC/combined-construct-auto_seq_independent-clauses.c @@ -47,7 +47,7 @@ void uses() { for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop auto vector for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'parallel loop' directive}} #pragma acc parallel loop auto nohost for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop auto default(none) @@ -164,7 +164,7 @@ void uses() { for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop vector auto for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'parallel loop' directive}} #pragma acc parallel loop nohost auto for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop default(none) auto @@ -282,7 +282,7 @@ void uses() { for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop independent vector for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'parallel loop' directive}} #pragma acc parallel loop independent nohost for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop independent default(none) @@ -399,7 +399,7 @@ void uses() { for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop vector independent for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'parallel loop' directive}} #pragma acc parallel loop nohost independent for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop default(none) independent @@ -525,7 +525,7 @@ void uses() { // expected-error@+1{{OpenACC 'if_present' clause is not valid on 'parallel loop' directive}} #pragma acc parallel loop seq if_present for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'parallel loop' directive}} #pragma acc parallel loop seq nohost for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop seq default(none) @@ -648,7 +648,7 @@ void uses() { // expected-error@+1{{OpenACC 'if_present' clause is not valid on 'parallel loop' directive}} #pragma acc parallel loop if_present seq for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'parallel loop' directive}} #pragma acc parallel loop nohost seq for(unsigned i = 0; i < 5; ++i); #pragma acc parallel loop default(none) seq diff --git a/clang/test/SemaOpenACC/combined-construct-device_type-clause.c b/clang/test/SemaOpenACC/combined-construct-device_type-clause.c index 2d7a9418cce15..49987663c79e1 100644 --- a/clang/test/SemaOpenACC/combined-construct-device_type-clause.c +++ b/clang/test/SemaOpenACC/combined-construct-device_type-clause.c @@ -56,8 +56,7 @@ void uses() { for(int i = 0; i < 5; ++i); #pragma acc parallel loop device_type(*) worker for(int i = 0; i < 5; ++i); - // expected-error@+2{{OpenACC clause 'nohost' may not follow a 'device_type' clause in a 'serial loop' construct}} - // expected-note@+1{{previous clause is here}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'serial loop' directive}} #pragma acc serial loop device_type(*) nohost for(int i = 0; i < 5; ++i); // expected-error@+2{{OpenACC clause 'default' may not follow a 'device_type' clause in a 'kernels loop' construct}} diff --git a/clang/test/SemaOpenACC/compute-construct-device_type-clause.c b/clang/test/SemaOpenACC/compute-construct-device_type-clause.c index 5f464cc94b092..a41936b57f09a 100644 --- a/clang/test/SemaOpenACC/compute-construct-device_type-clause.c +++ b/clang/test/SemaOpenACC/compute-construct-device_type-clause.c @@ -62,8 +62,7 @@ void uses() { // expected-error@+1{{OpenACC 'worker' clause is not valid on 'kernels' directive}} #pragma acc kernels device_type(*) worker while(1); - // expected-error@+2{{OpenACC clause 'nohost' may not follow a 'device_type' clause in a 'kernels' construct}} - // expected-note@+1{{previous clause is here}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'kernels' directive}} #pragma acc kernels device_type(*) nohost while(1); // expected-error@+2{{OpenACC clause 'default' may not follow a 'device_type' clause in a 'kernels' construct}} diff --git a/clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c b/clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c index 1c1db8c7577c3..9dde1a96720d0 100644 --- a/clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c +++ b/clang/test/SemaOpenACC/loop-construct-auto_seq_independent-clauses.c @@ -60,7 +60,7 @@ void uses() { for(unsigned i = 0; i < 5; ++i); #pragma acc loop auto vector for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'loop' directive}} #pragma acc loop auto nohost for(unsigned i = 0; i < 5; ++i); // expected-error@+1{{OpenACC 'default' clause is not valid on 'loop' directive}} @@ -194,7 +194,7 @@ void uses() { for(unsigned i = 0; i < 5; ++i); #pragma acc loop vector auto for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'loop' directive}} #pragma acc loop nohost auto for(unsigned i = 0; i < 5; ++i); // expected-error@+1{{OpenACC 'default' clause is not valid on 'loop' directive}} @@ -329,7 +329,7 @@ void uses() { for(unsigned i = 0; i < 5; ++i); #pragma acc loop independent vector for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'loop' directive}} #pragma acc loop independent nohost for(unsigned i = 0; i < 5; ++i); // expected-error@+1{{OpenACC 'default' clause is not valid on 'loop' directive}} @@ -463,7 +463,7 @@ void uses() { for(unsigned i = 0; i < 5; ++i); #pragma acc loop vector independent for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'loop' directive}} #pragma acc loop nohost independent for(unsigned i = 0; i < 5; ++i); // expected-error@+1{{OpenACC 'default' clause is not valid on 'loop' directive}} @@ -606,7 +606,7 @@ void uses() { // expected-error@+1{{OpenACC 'if_present' clause is not valid on 'loop' directive}} #pragma acc loop seq if_present for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'loop' directive}} #pragma acc loop seq nohost for(unsigned i = 0; i < 5; ++i); // expected-error@+1{{OpenACC 'default' clause is not valid on 'loop' directive}} @@ -746,7 +746,7 @@ void uses() { // expected-error@+1{{OpenACC 'if_present' clause is not valid on 'loop' directive}} #pragma acc loop if_present seq for(unsigned i = 0; i < 5; ++i); - // expected-warning@+1{{OpenACC clause 'nohost' not yet implemented}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'loop' directive}} #pragma acc loop nohost seq for(unsigned i = 0; i < 5; ++i); // expected-error@+1{{OpenACC 'default' clause is not valid on 'loop' directive}} diff --git a/clang/test/SemaOpenACC/loop-construct-device_type-clause.c b/clang/test/SemaOpenACC/loop-construct-device_type-clause.c index f05ca11b143c0..83100b80bff91 100644 --- a/clang/test/SemaOpenACC/loop-construct-device_type-clause.c +++ b/clang/test/SemaOpenACC/loop-construct-device_type-clause.c @@ -55,8 +55,7 @@ void uses() { for(int i = 0; i < 5; ++i); #pragma acc loop device_type(*) worker for(int i = 0; i < 5; ++i); - // expected-error@+2{{OpenACC clause 'nohost' may not follow a 'device_type' clause in a 'loop' construct}} - // expected-note@+1{{previous clause is here}} + // expected-error@+1{{OpenACC 'nohost' clause is not valid on 'loop' directive}} #pragma acc loop device_type(*) nohost for(int i = 0; i < 5; ++i); // expected-error@+1{{OpenACC 'default' clause is not valid on 'loop' directive}} diff --git a/clang/test/SemaOpenACC/routine-construct-clauses.cpp b/clang/test/SemaOpenACC/routine-construct-clauses.cpp index 5390f4d326918..ac9289b798a3e 100644 --- a/clang/test/SemaOpenACC/routine-construct-clauses.cpp +++ b/clang/test/SemaOpenACC/routine-construct-clauses.cpp @@ -56,9 +56,9 @@ void Func(); // expected-error@+2{{OpenACC clause 'gang' may not appear on the same construct as a 'gang' clause on a 'routine' construct}} // expected-note@+1{{previous clause is here}} #pragma acc routine(Func) gang gang -// expected-error@+1{{REQUIRED}} +// expected-error@+1{{OpenACC 'routine' construct must have at least one 'gang', 'worker', 'vector' or 'seq' clause}} #pragma acc routine(Func) -// expected-error@+1{{REQUIRED}} +// expected-error@+1{{OpenACC 'routine' construct must have at least one 'gang', 'worker', 'vector' or 'seq' clause}} #pragma acc routine(Func) nohost // only the 'dim' syntax for gang is legal. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
