[utils] Avoid hardcoding metadata ids in update_cc_test_checks

[jkorous]

Summary

Specifically for: !tbaa, !tbaa.struct, !annotation, !srcloc, !nosanitize.

The goal is to avoid test brittleness caused by hardcoded values.

[lebedev.ri]

Can you follow the pattern of how the tests for other update utils are written, by autogenerating the check lines, committing such a file, and comparing that newly-generated checlines don't differ?

[jkorous]

Sure, will do! I intended to keep the tests simple but understand the desire for consistency.

[jkorous]

Made the tests consistent with other pre-existing tests.

[jkorous]

Friendly ping.

[jkorous]

Ping.

[jdoerfert]

LG

[jdoerfert]

llvm/utils/UpdateTestChecks/common.py

608

Style: Maybe realign the above again.

[dyung]

Hi @jkorous, 4 of the tests you added seem to be failing on the PS4 linux and Window buildbots, can you take a look, and revert if it might take a while to investigate?

https://lab.llvm.org/buildbot/#/builders/139/builds/21573
https://lab.llvm.org/buildbot/#/builders/216/builds/4167

[thakis]

Also fails on linux: https://lab.llvm.org/buildbot/#/builders/109/builds/38285

And on mac: http://45.33.8.238/macm1/35024/step_7.txt

(On some platforms, the bot redness was masked by D124552 breaking the bots first.)

But yes, please fix or revert.

[Jake-Egan]

4 of the tests fail on AIX also: https://lab.llvm.org/buildbot/#/builders/214/builds/1207

[jkorous]

Reverting for now. Will take a look.

clang/test/utils/update_cc_test_checks/Inputs/annotation-id.c

+// RUN: %clang_cc1 -ftrivial-auto-var-init=zero -triple=x86_64-unknown-linux-gnu -O1 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s
+
+void foo_ptr_to_scalar() {
+  unsigned long long* a[100];
+}

clang/test/utils/update_cc_test_checks/Inputs/nosanitize-id.c

+// RUN: %clang_cc1 -fsanitize=shift-exponent,shift-base -triple=x86_64-unknown-linux-gnu -O1 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s
+
+void foo(int* c, int* shamt) {
+  *c = 1 << (*c << *shamt);
+}

clang/test/utils/update_cc_test_checks/Inputs/srcloc-id.c

+// RUN: %clang_cc1 -triple=x86_64-unknown-linux-gnu -O1 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s
+__attribute__((error("oh no"))) void foo(void);
+
+void bar(void) {
+  foo();
+}

clang/test/utils/update_cc_test_checks/Inputs/tbaa-id.c

+// RUN: %clang_cc1 -triple=x86_64-unknown-linux-gnu -O1 -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s
+
+void foo(unsigned **ptr) {
+  *ptr = 0;
+}

clang/test/utils/update_cc_test_checks/Inputs/tbaa-struct-id.c

+// RUN: %clang_cc1 -flegacy-pass-manager -triple arm64-apple-iphoneos -Oz -mllvm -enable-constraint-elimination=true -fpass-by-value-is-noalias -emit-llvm -o - %s | FileCheck %s
+
+typedef struct {
+  void *a;
+  void *b;
+  void *c;
+  void *d;
+  void *e;
+} Foo;
+
+static void bar(Foo f) {
+  if (f.b)
+    __builtin_trap();
+}
+
+static int baz(Foo f) {
+  bar(f);
+  return *(int *)f.a;
+}
+
+int barbar(Foo arg) {
+  int a, b;
+  a = baz(arg);
+  return a - b;
+}

clang/test/utils/update_cc_test_checks/annotation-id.test

+# RUN: cp -f %S/Inputs/annotation-id.c %t.c
+# RUN: %update_cc_test_checks %t.c
+# RUN: not grep "!annotation ![0-9]" %t.c
+# RUN: grep "!annotation \[\[ANNT[0-9]\+:!\[0-9\]+\]\]" %t.c

clang/test/utils/update_cc_test_checks/nosanitize-id.test

+# RUN: cp -f %S/Inputs/nosanitize-id.c %t.c
+# RUN: %update_cc_test_checks %t.c
+# RUN: not grep "!nosanitize ![0-9]" %t.c
+# RUN: grep "!nosanitize \[\[NOSAN[0-9]\+:!\[0-9\]+\]\]" %t.c

clang/test/utils/update_cc_test_checks/srcloc-id.test

+# RUN: cp -f %S/Inputs/srcloc-id.c %t.c
+# RUN: %update_cc_test_checks %t.c
+# RUN: not grep "!srcloc ![0-9]" %t.c
+# RUN: grep "!srcloc \[\[SRCLOC[0-9]\+:!\[0-9\]+\]\]" %t.c

clang/test/utils/update_cc_test_checks/tbaa-id.test

+# RUN: cp -f %S/Inputs/tbaa-id.c %t.c
+# RUN: %update_cc_test_checks %t.c
+# RUN: not grep "!tbaa ![0-9]" %t.c
+# RUN: grep "!tbaa \[\[TBAA[0-9]\+:!\[0-9\]+\]\]" %t.c

clang/test/utils/update_cc_test_checks/tbaa-struct-id.test

+# RUN: cp -f %S/Inputs/tbaa-struct-id.c %t.c
+# RUN: %update_cc_test_checks %t.c
+# RUN: not grep "!tbaa\.struct ![0-9]" %t.c
+# RUN: grep "!tbaa\.struct \[\[TBAAST[0-9]\+:!\[0-9\]+\]\]" %t.c

llvm/utils/UpdateTestChecks/common.py

 nameless_values = [
     NamelessValue(r'TMP'  , '%' , r'%'           , None            , None                   , r'[\w$.-]+?' , None                 , False) ,
     NamelessValue(r'ATTR' , '#' , r'#'           , None            , None                   , r'[0-9]+'    , None                 , False) ,
     NamelessValue(r'ATTR' , '#' , None           , r'attributes #' , r'[0-9]+'              , None         , r'{[^}]*}'           , False) ,
     NamelessValue(r'GLOB' , '@' , r'@'           , None            , None                   , r'[0-9]+'    , None                 , False) ,
     NamelessValue(r'GLOB' , '@' , None           , r'@'            , r'[a-zA-Z0-9_$"\\.-]+' , None         , r'.+'                , True)  ,
     NamelessValue(r'DBG'  , '!' , r'!dbg '       , None            , None                   , r'![0-9]+'   , None                 , False) ,
     NamelessValue(r'PROF' , '!' , r'!prof '      , None            , None                   , r'![0-9]+'   , None                 , False) ,
-    NamelessValue(r'TBAA' , '!' , r'!tbaa '      , None            , None                   , r'![0-9]+'   , None                 , False) ,
     NamelessValue(r'RNG'  , '!' , r'!range '     , None            , None                   , r'![0-9]+'   , None                 , False) ,
     NamelessValue(r'LOOP' , '!' , r'!llvm.loop ' , None            , None                   , r'![0-9]+'   , None                 , False) ,
     NamelessValue(r'META' , '!' , r'metadata '   , None            , None                   , r'![0-9]+'   , None                 , False) ,
     NamelessValue(r'META' , '!' , None           , r''             , r'![0-9]+'             , None         , r'(?:distinct |)!.*' , False) ,
+    NamelessValue(r'TBAA' , '!' , r'!tbaa '      , None            , None                   , r'![0-9]+'   , None                 , False) ,
+    NamelessValue(r'TBAAST' , '!' , r'!tbaa.struct ', None            , None                   , r'![0-9]+'   , None                 , False) ,
+    NamelessValue(r'ANNT'   , '!' , r'!annotation ' , None            , None                   , r'![0-9]+'   , None                 , False) ,
+    NamelessValue(r'SRCLOC' , '!' , r'!srcloc '     , None            , None                   , r'![0-9]+'   , None                 , False) ,
+    NamelessValue(r'NOSAN'  , '!' , r'!nosanitize ' , None            , None                   , r'![0-9]+'   , None                 , False) ,
 ]
 
 def createOrRegexp(old, new):
     if not old:
         return new
     if not new:
         return old
     return old + '|' + new