[PATCH] D73162: [test] Avoid loop-unroll.c test getting confused by fadd in git revision

[Russell Gallop via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG4662f6e1c778: [test] Avoid loop-unroll.c test getting 
confused by fadd in git revision (authored by russell.gallop).

Changed prior to commit:
  https://reviews.llvm.org/D73162?vs=239808&id=239812#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D73162/new/

https://reviews.llvm.org/D73162

Files:
  clang/test/CodeGen/loop-unroll.c


Index: clang/test/CodeGen/loop-unroll.c
===
--- clang/test/CodeGen/loop-unroll.c
+++ clang/test/CodeGen/loop-unroll.c
@@ -37,6 +37,8 @@
 // CHECK-DISABLE-UNROLL-NOT: fmul
 // CHECK-DISABLE-UNROLL-NOT: fadd
 // CHECK-DISABLE-UNROLL-NOT: store
+// Limit scope of checking so this does not match "fadd" within git version 
string
+// CHECK-DISABLE-UNROLL: !0 =
 
 int printf(const char * restrict format, ...);
 


Index: clang/test/CodeGen/loop-unroll.c
===
--- clang/test/CodeGen/loop-unroll.c
+++ clang/test/CodeGen/loop-unroll.c
@@ -37,6 +37,8 @@
 // CHECK-DISABLE-UNROLL-NOT: fmul
 // CHECK-DISABLE-UNROLL-NOT: fadd
 // CHECK-DISABLE-UNROLL-NOT: store
+// Limit scope of checking so this does not match "fadd" within git version string
+// CHECK-DISABLE-UNROLL: !0 =
 
 int printf(const char * restrict format, ...);
 
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D73162: [test] Avoid loop-unroll.c test getting confused by fadd in git revision

[Russell Gallop via Phabricator via cfe-commits]

russell.gallop added a comment.

In D73162#1834379 , @asbirlea wrote:

> Oh, wow! Might I ask you add the same for fmul? We may get a revision like 
> that next time :).
>  Thank you!


fmul shouldn't have the same problem as git hashes are only hex characters.

In D73162#1834392 , @fhahn wrote:

> I think  we could also just add a single match for something after the 
> generated functions, to limit the scope of CHECK-NOT, e.g add something like 
> `CHECK : !0 =`


Thanks, that's cleaner.

Note that the diff here is a little confused. There are now no changes to the 
previous check lines.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D73162/new/

https://reviews.llvm.org/D73162



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D73162: [test] Avoid loop-unroll.c test getting confused by fadd in git revision

[Russell Gallop via Phabricator via cfe-commits]

russell.gallop updated this revision to Diff 239808.
russell.gallop added a comment.

Update to check for start of metadata.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D73162/new/

https://reviews.llvm.org/D73162

Files:
  clang/test/CodeGen/loop-unroll.c


Index: clang/test/CodeGen/loop-unroll.c
===
--- clang/test/CodeGen/loop-unroll.c
+++ clang/test/CodeGen/loop-unroll.c
@@ -37,9 +37,11 @@
 // CHECK-DISABLE-UNROLL-NOT: fmul
 // CHECK-DISABLE-UNROLL-NOT: fadd
 // CHECK-DISABLE-UNROLL-NOT: store
+// Limit scope of checking so this does not match "fadd" within git version 
string
+// CHECK-DISABLE-UNROLL: !0 =

 int printf(const char * restrict format, ...);

 void for_test() {
   double A[1000], B[1000];
   int L = 500;


Index: clang/test/CodeGen/loop-unroll.c
===
--- clang/test/CodeGen/loop-unroll.c
+++ clang/test/CodeGen/loop-unroll.c
@@ -37,9 +37,11 @@
 // CHECK-DISABLE-UNROLL-NOT: fmul
 // CHECK-DISABLE-UNROLL-NOT: fadd
 // CHECK-DISABLE-UNROLL-NOT: store
+// Limit scope of checking so this does not match "fadd" within git version string
+// CHECK-DISABLE-UNROLL: !0 =

 int printf(const char * restrict format, ...);

 void for_test() {
   double A[1000], B[1000];
   int L = 500;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D73162: [test] Avoid loop-unroll.c test getting confused by fadd in git revision

[Alina Sbirlea via Phabricator via cfe-commits]

asbirlea added a comment.

SGTM.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D73162/new/

https://reviews.llvm.org/D73162



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D73162: [test] Avoid loop-unroll.c test getting confused by fadd in git revision

[Florian Hahn via Phabricator via cfe-commits]

fhahn added a comment.

I think  we could also just add a single match for something after the 
generated functions, to limit the scope of CHECK-NOT, e.g add something like 
`CHECK : !0 =`


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D73162/new/

https://reviews.llvm.org/D73162



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D73162: [test] Avoid loop-unroll.c test getting confused by fadd in git revision

[Alina Sbirlea via Phabricator via cfe-commits]

asbirlea accepted this revision.
asbirlea added a comment.
This revision is now accepted and ready to land.

Oh, wow! Might I ask you add the same for fmul? We may get a revision like that 
next time :).
Thank you!


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D73162/new/

https://reviews.llvm.org/D73162



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D73162: [test] Avoid loop-unroll.c test getting confused by fadd in git revision

[Russell Gallop via Phabricator via cfe-commits]

russell.gallop created this revision.
russell.gallop added a reviewer: asbirlea.
Herald added a subscriber: zzheng.
Herald added a project: clang.

Saw this test failing as it was matching fadd in a (local) git revision:

  F:\git\llvm-project\clang\test\CodeGen\loop-unroll.c:38:30: error: 
CHECK-DISABLE-UNROLL-NOT: excluded string found in input
  // CHECK-DISABLE-UNROLL-NOT: fadd
   ^
  :69:92: note: found here
  !1 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 
a3eebdb6c1376e528a6fadd5eb33bb6eb986a126)"}


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D73162

Files:
  clang/test/CodeGen/loop-unroll.c


Index: clang/test/CodeGen/loop-unroll.c
===
--- clang/test/CodeGen/loop-unroll.c
+++ clang/test/CodeGen/loop-unroll.c
@@ -12,15 +12,15 @@
 // CHECK-ENABLE-UNROLL: br i1 %[[EXITCOND:[a-z0-9_\.]+]], label 
%[[FORBODY5:[a-z0-9_\.]+]], label %[[FORBODY]]
 // CHECK-ENABLE-UNROLL: [[FORBODY5]]:
 // CHECK-ENABLE-UNROLL: fmul
-// CHECK-ENABLE-UNROLL: fadd
+// CHECK-ENABLE-UNROLL: fadd double
 // CHECK-ENABLE-UNROLL: store
 // CHECK-ENABLE-UNROLL: fmul
-// CHECK-ENABLE-UNROLL: fadd
+// CHECK-ENABLE-UNROLL: fadd double
 // CHECK-ENABLE-UNROLL: store
 // CHECK-ENABLE-UNROLL: fmul
-// CHECK-ENABLE-UNROLL: fadd
+// CHECK-ENABLE-UNROLL: fadd double
 // CHECK-ENABLE-UNROLL: store

 // CHECK-DISABLE-UNROLL-LABEL: @for_test()
 // CHECK-DISABLE-UNROLL: br label %[[FORBODY:[a-z0-9_\.]+]]
 // CHECK-DISABLE-UNROLL: [[FORBODY]]:
@@ -29,17 +29,17 @@
 // CHECK-DISABLE-UNROLL: br i1 %[[EXITCOND:[a-z0-9_\.]+]], label 
%[[FORBODY5:[a-z0-9_\.]+]], label %[[FORBODY]]
 // CHECK-DISABLE-UNROLL: [[FORBODY5]]:
 // CHECK-DISABLE-UNROLL: fmul
-// CHECK-DISABLE-UNROLL: fadd
+// CHECK-DISABLE-UNROLL: fadd double
 // CHECK-DISABLE-UNROLL: store
 // CHECK-DISABLE-UNROLL: fmul
-// CHECK-DISABLE-UNROLL: fadd
+// CHECK-DISABLE-UNROLL: fadd double
 // CHECK-DISABLE-UNROLL: store
 // CHECK-DISABLE-UNROLL-NOT: fmul
-// CHECK-DISABLE-UNROLL-NOT: fadd
+// CHECK-DISABLE-UNROLL-NOT: fadd double
 // CHECK-DISABLE-UNROLL-NOT: store

 int printf(const char * restrict format, ...);

 void for_test() {
   double A[1000], B[1000];
   int L = 500;


Index: clang/test/CodeGen/loop-unroll.c
===
--- clang/test/CodeGen/loop-unroll.c
+++ clang/test/CodeGen/loop-unroll.c
@@ -12,15 +12,15 @@
 // CHECK-ENABLE-UNROLL: br i1 %[[EXITCOND:[a-z0-9_\.]+]], label %[[FORBODY5:[a-z0-9_\.]+]], label %[[FORBODY]]
 // CHECK-ENABLE-UNROLL: [[FORBODY5]]:
 // CHECK-ENABLE-UNROLL: fmul
-// CHECK-ENABLE-UNROLL: fadd
+// CHECK-ENABLE-UNROLL: fadd double
 // CHECK-ENABLE-UNROLL: store
 // CHECK-ENABLE-UNROLL: fmul
-// CHECK-ENABLE-UNROLL: fadd
+// CHECK-ENABLE-UNROLL: fadd double
 // CHECK-ENABLE-UNROLL: store
 // CHECK-ENABLE-UNROLL: fmul
-// CHECK-ENABLE-UNROLL: fadd
+// CHECK-ENABLE-UNROLL: fadd double
 // CHECK-ENABLE-UNROLL: store

 // CHECK-DISABLE-UNROLL-LABEL: @for_test()
 // CHECK-DISABLE-UNROLL: br label %[[FORBODY:[a-z0-9_\.]+]]
 // CHECK-DISABLE-UNROLL: [[FORBODY]]:
@@ -29,17 +29,17 @@
 // CHECK-DISABLE-UNROLL: br i1 %[[EXITCOND:[a-z0-9_\.]+]], label %[[FORBODY5:[a-z0-9_\.]+]], label %[[FORBODY]]
 // CHECK-DISABLE-UNROLL: [[FORBODY5]]:
 // CHECK-DISABLE-UNROLL: fmul
-// CHECK-DISABLE-UNROLL: fadd
+// CHECK-DISABLE-UNROLL: fadd double
 // CHECK-DISABLE-UNROLL: store
 // CHECK-DISABLE-UNROLL: fmul
-// CHECK-DISABLE-UNROLL: fadd
+// CHECK-DISABLE-UNROLL: fadd double
 // CHECK-DISABLE-UNROLL: store
 // CHECK-DISABLE-UNROLL-NOT: fmul
-// CHECK-DISABLE-UNROLL-NOT: fadd
+// CHECK-DISABLE-UNROLL-NOT: fadd double
 // CHECK-DISABLE-UNROLL-NOT: store

 int printf(const char * restrict format, ...);

 void for_test() {
   double A[1000], B[1000];
   int L = 500;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits