Fix diagnostics/add tests as requested by corentin

erichkeane · erichkeane · commit 6609de65601e · 2025-05-02T06:48:12.000-07:00
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -12990,6 +12990,13 @@ def err_acc_duplicate_clause_disallowed
     : Error<"OpenACC '%1' clause cannot appear more than once on a '%0' "
             "directive">;
 def note_acc_previous_clause_here : Note<"previous clause is here">;
+// TODO(OpenACC): Combine these with the one above, and decide between a
+// 'select' to split between showing the clause name, or just always printing
+// the name.
+def note_acc_previous_named_clause_here : Note<"previous '%0' clause is here">;
+def note_acc_device_type_here
+    : Note<"%enum_select<ACCDeviceTypeApp>{%Active{active}|%Applies{which "
+           "applies to}}0 'device_type' clause here">;
 def note_acc_previous_expr_here : Note<"previous expression is here">;
 def note_acc_previous_reference : Note<"previous reference is here">;
 def err_acc_branch_in_out_compute_construct
@@ -13077,7 +13084,7 @@ def err_acc_clause_since_last_device_type
             "'device_type' region}2 on a '%1' directive">;
 def err_acc_clause_conflicts_prev_dev_type
     : Error<"OpenACC '%0' clause applies to 'device_type' '%1', which "
-            "conflicts with previous clause">;
+            "conflicts with previous '%0' clause">;
 
 def err_acc_reduction_num_gangs_conflict
     : Error<"OpenACC '%1' clause %select{|with more than 1 argument }0may not "
diff --git a/clang/lib/Sema/SemaOpenACCClause.cpp b/clang/lib/Sema/SemaOpenACCClause.cpp
@@ -417,13 +417,16 @@ class SemaOpenACCClauseVisitor {
                                             : "*");
             // mention the active device type.
             SemaRef.Diag(ActiveDeviceTypeClause.getBeginLoc(),
-                         diag::note_acc_previous_clause_here);
+                         diag::note_acc_device_type_here)
+                << diag::ACCDeviceTypeApp::Active;
             // mention the previous clause.
             SemaRef.Diag((*CurClauseKindItr)->getBeginLoc(),
-                         diag::note_acc_previous_clause_here);
+                         diag::note_acc_previous_named_clause_here)
+                << (*CurClauseKindItr)->getClauseKind();
             // mention the previous device type.
             SemaRef.Diag(CurDeviceTypeClause.getBeginLoc(),
-                         diag::note_acc_previous_clause_here);
+                         diag::note_acc_device_type_here)
+                << diag::ACCDeviceTypeApp::Applies;
             return true;
           }
         }
diff --git a/clang/test/SemaOpenACC/compute-construct-num_gangs-clause.c b/clang/test/SemaOpenACC/compute-construct-num_gangs-clause.c
@@ -73,16 +73,16 @@ void Test() {
 }
 
 void no_dupes_since_last_device_type() {
-  // expected-error@+4{{OpenACC 'num_gangs' clause applies to 'device_type' 'radeon', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'num_gangs' clause applies to 'device_type' 'radeon', which conflicts with previous 'num_gangs' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'num_gangs' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc parallel device_type(nvidia, radeon) num_gangs(getS()) device_type(radeon) num_gangs(getS())
   ;
-  // expected-error@+4{{OpenACC 'num_gangs' clause applies to 'device_type' 'nvidia', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'num_gangs' clause applies to 'device_type' 'nvidia', which conflicts with previous 'num_gangs' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'num_gangs' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc parallel device_type(nvidia) num_gangs(getS()) device_type(nvidia, radeon) num_gangs(getS())
   ;
 }
diff --git a/clang/test/SemaOpenACC/compute-construct-num_workers-clause.c b/clang/test/SemaOpenACC/compute-construct-num_workers-clause.c
@@ -62,16 +62,16 @@ void Test() {
 }
 
 void no_dupes_since_last_device_type() {
-  // expected-error@+4{{OpenACC 'num_workers' clause applies to 'device_type' 'radEon', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'num_workers' clause applies to 'device_type' 'radEon', which conflicts with previous 'num_workers' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'num_workers' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc parallel device_type(nvidia, radeon) num_workers(getS()) device_type(radEon) num_workers(getS())
   ;
-  // expected-error@+4{{OpenACC 'num_workers' clause applies to 'device_type' 'nvidia', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'num_workers' clause applies to 'device_type' 'nvidia', which conflicts with previous 'num_workers' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'num_workers' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc parallel device_type(nvidia) num_workers(getS()) device_type(nvidia, radeon) num_workers(getS())
   ;
 }
diff --git a/clang/test/SemaOpenACC/compute-construct-vector_length-clause.c b/clang/test/SemaOpenACC/compute-construct-vector_length-clause.c
@@ -62,16 +62,16 @@ void Test() {
 }
 
 void no_dupes_since_last_device_type() {
-  // expected-error@+4{{OpenACC 'vector_length' clause applies to 'device_type' 'radeon', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'vector_length' clause applies to 'device_type' 'radeon', which conflicts with previous 'vector_length' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'vector_length' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc parallel device_type(nvidia, radeon) vector_length(getS()) device_type(radeon) vector_length(getS())
   ;
-  // expected-error@+4{{OpenACC 'vector_length' clause applies to 'device_type' 'nvidia', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'vector_length' clause applies to 'device_type' 'nvidia', which conflicts with previous 'vector_length' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'vector_length' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc parallel device_type(nvidia) vector_length(getS()) device_type(nvidia, radeon) vector_length(getS())
   ;
 }
diff --git a/clang/test/SemaOpenACC/loop-construct-collapse-clause.cpp b/clang/test/SemaOpenACC/loop-construct-collapse-clause.cpp
@@ -548,27 +548,27 @@ void no_dupes_since_last_device_type() {
 #pragma acc loop device_type(nvidia) collapse(1) device_type(*) collapse(2)
   for(unsigned i = 0; i < 5; ++i)
     for(unsigned j = 0; j < 5; ++j);
-
-  // expected-error@+4{{OpenACC 'collapse' clause applies to 'device_type' '*', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  
+  // expected-error@+4{{OpenACC 'collapse' clause applies to 'device_type' '*', which conflicts with previous 'collapse' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'collapse' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc loop device_type(*) collapse(1) device_type(*) collapse(2)
   for(unsigned i = 0; i < 5; ++i)
     for(unsigned j = 0; j < 5; ++j);
 
-  // expected-error@+4{{OpenACC 'collapse' clause applies to 'device_type' 'nvidia', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'collapse' clause applies to 'device_type' 'nvidia', which conflicts with previous 'collapse' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'collapse' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc loop device_type(nviDia, radeon) collapse(1) device_type(nvidia) collapse(2)
   for(unsigned i = 0; i < 5; ++i)
     for(unsigned j = 0; j < 5; ++j);
 
-  // expected-error@+4{{OpenACC 'collapse' clause applies to 'device_type' 'radeon', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'collapse' clause applies to 'device_type' 'radeon', which conflicts with previous 'collapse' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'collapse' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc loop device_type(radeon) collapse(1) device_type(nvidia, radeon) collapse(2)
   for(unsigned i = 0; i < 5; ++i)
     for(unsigned j = 0; j < 5; ++j);
diff --git a/clang/test/SemaOpenACC/loop-construct-tile-clause.cpp b/clang/test/SemaOpenACC/loop-construct-tile-clause.cpp
@@ -420,18 +420,18 @@ void no_dupes_since_last_device_type() {
   for(unsigned i = 0; i < 5; ++i)
     for(unsigned j = 0; j < 5; ++j);
 
-  // expected-error@+4{{OpenACC 'tile' clause applies to 'device_type' 'nvidiA', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'tile' clause applies to 'device_type' 'nvidiA', which conflicts with previous 'tile' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'tile' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc loop device_type(nvidia, radeon) tile(1) device_type(nvidiA) tile(2)
   for(unsigned i = 0; i < 5; ++i)
     for(unsigned j = 0; j < 5; ++j);
 
-  // expected-error@+4{{OpenACC 'tile' clause applies to 'device_type' 'radeon', which conflicts with previous clause}}
-  // expected-note@+3{{previous clause is here}}
-  // expected-note@+2{{previous clause is here}}
-  // expected-note@+1{{previous clause is here}}
+  // expected-error@+4{{OpenACC 'tile' clause applies to 'device_type' 'radeon', which conflicts with previous 'tile' clause}}
+  // expected-note@+3{{active 'device_type' clause here}}
+  // expected-note@+2{{previous 'tile' clause is here}}
+  // expected-note@+1{{which applies to 'device_type' clause here}}
 #pragma acc loop device_type(radeon) tile(1) device_type(nvidia, radeon) tile(2)
   for(unsigned i = 0; i < 5; ++i)
     for(unsigned j = 0; j < 5; ++j);

Original file line number	Diff line number	Diff line change
`@@ -73,16 +73,16 @@ void Test() {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`void no_dupes_since_last_device_type() {`
`76`		`- // expected-error@+4{{OpenACC 'num_gangs' clause applies to 'device_type' 'radeon', which conflicts with previous clause}}`
`77`		`- // expected-note@+3{{previous clause is here}}`
`78`		`- // expected-note@+2{{previous clause is here}}`
`79`		`- // expected-note@+1{{previous clause is here}}`
	`76`	`+ // expected-error@+4{{OpenACC 'num_gangs' clause applies to 'device_type' 'radeon', which conflicts with previous 'num_gangs' clause}}`
	`77`	`+ // expected-note@+3{{active 'device_type' clause here}}`
	`78`	`+ // expected-note@+2{{previous 'num_gangs' clause is here}}`
	`79`	`+ // expected-note@+1{{which applies to 'device_type' clause here}}`
`80`	`80`	`#pragma acc parallel device_type(nvidia, radeon) num_gangs(getS()) device_type(radeon) num_gangs(getS())`
`81`	`81`	`;`
`82`		`- // expected-error@+4{{OpenACC 'num_gangs' clause applies to 'device_type' 'nvidia', which conflicts with previous clause}}`
`83`		`- // expected-note@+3{{previous clause is here}}`
`84`		`- // expected-note@+2{{previous clause is here}}`
`85`		`- // expected-note@+1{{previous clause is here}}`
	`82`	`+ // expected-error@+4{{OpenACC 'num_gangs' clause applies to 'device_type' 'nvidia', which conflicts with previous 'num_gangs' clause}}`
	`83`	`+ // expected-note@+3{{active 'device_type' clause here}}`
	`84`	`+ // expected-note@+2{{previous 'num_gangs' clause is here}}`
	`85`	`+ // expected-note@+1{{which applies to 'device_type' clause here}}`
`86`	`86`	`#pragma acc parallel device_type(nvidia) num_gangs(getS()) device_type(nvidia, radeon) num_gangs(getS())`
`87`	`87`	`;`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,16 +62,16 @@ void Test() {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`void no_dupes_since_last_device_type() {`
`65`		`- // expected-error@+4{{OpenACC 'num_workers' clause applies to 'device_type' 'radEon', which conflicts with previous clause}}`
`66`		`- // expected-note@+3{{previous clause is here}}`
`67`		`- // expected-note@+2{{previous clause is here}}`
`68`		`- // expected-note@+1{{previous clause is here}}`
	`65`	`+ // expected-error@+4{{OpenACC 'num_workers' clause applies to 'device_type' 'radEon', which conflicts with previous 'num_workers' clause}}`
	`66`	`+ // expected-note@+3{{active 'device_type' clause here}}`
	`67`	`+ // expected-note@+2{{previous 'num_workers' clause is here}}`
	`68`	`+ // expected-note@+1{{which applies to 'device_type' clause here}}`
`69`	`69`	`#pragma acc parallel device_type(nvidia, radeon) num_workers(getS()) device_type(radEon) num_workers(getS())`
`70`	`70`	`;`
`71`		`- // expected-error@+4{{OpenACC 'num_workers' clause applies to 'device_type' 'nvidia', which conflicts with previous clause}}`
`72`		`- // expected-note@+3{{previous clause is here}}`
`73`		`- // expected-note@+2{{previous clause is here}}`
`74`		`- // expected-note@+1{{previous clause is here}}`
	`71`	`+ // expected-error@+4{{OpenACC 'num_workers' clause applies to 'device_type' 'nvidia', which conflicts with previous 'num_workers' clause}}`
	`72`	`+ // expected-note@+3{{active 'device_type' clause here}}`
	`73`	`+ // expected-note@+2{{previous 'num_workers' clause is here}}`
	`74`	`+ // expected-note@+1{{which applies to 'device_type' clause here}}`
`75`	`75`	`#pragma acc parallel device_type(nvidia) num_workers(getS()) device_type(nvidia, radeon) num_workers(getS())`
`76`	`76`	`;`
`77`	`77`	`}`