[llvm] 935a6d4 - [test] Change llvm-xray options to use the preferred double-dash forms and change -f= to -f
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sun Aug 15 21:19:11 PDT 2021
Author: Fangrui Song
Date: 2021-08-15T21:19:04-07:00
New Revision: 935a6d4024295201f1e3e59c995a9dfa986836d7
URL: https://github.com/llvm/llvm-project/commit/935a6d4024295201f1e3e59c995a9dfa986836d7
DIFF: https://github.com/llvm/llvm-project/commit/935a6d4024295201f1e3e59c995a9dfa986836d7.diff
LOG: [test] Change llvm-xray options to use the preferred double-dash forms and change -f= to -f
Added:
Modified:
llvm/test/tools/llvm-xray/X86/account-recursive-calls-only-tail-call-deduction.yaml
llvm/test/tools/llvm-xray/X86/account-recursive-calls-only.yaml
llvm/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt
llvm/test/tools/llvm-xray/X86/convert-basic-log-arg1-version3-to-yaml.txt
llvm/test/tools/llvm-xray/X86/convert-basic-log-version3-to-yaml.txt
llvm/test/tools/llvm-xray/X86/convert-fdr-arg1-to-yaml.txt
llvm/test/tools/llvm-xray/X86/convert-fdr-log-arg1-version3-to-yaml.txt
llvm/test/tools/llvm-xray/X86/convert-fdr-log-version3-to-yaml.txt
llvm/test/tools/llvm-xray/X86/convert-fdr-to-traceevent.txt
llvm/test/tools/llvm-xray/X86/convert-fdr-to-yaml.txt
llvm/test/tools/llvm-xray/X86/convert-roundtrip.yaml
llvm/test/tools/llvm-xray/X86/convert-to-yaml.txt
llvm/test/tools/llvm-xray/X86/convert-traceevent-special-events.txt
llvm/test/tools/llvm-xray/X86/convert-with-debug-syms.txt
llvm/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt
llvm/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt
llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt
llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt
llvm/test/tools/llvm-xray/X86/stack-multithread.yaml
Removed:
################################################################################
diff --git a/llvm/test/tools/llvm-xray/X86/account-recursive-calls-only-tail-call-deduction.yaml b/llvm/test/tools/llvm-xray/X86/account-recursive-calls-only-tail-call-deduction.yaml
index 4f5d01b2cf9b1..2b08cc0f7e984 100644
--- a/llvm/test/tools/llvm-xray/X86/account-recursive-calls-only-tail-call-deduction.yaml
+++ b/llvm/test/tools/llvm-xray/X86/account-recursive-calls-only-tail-call-deduction.yaml
@@ -1,5 +1,5 @@
-# RUN: llvm-xray account -d %s -o - -m %S/Inputs/simple-instrmap.yaml | FileCheck --check-prefixes=ALL %s
-# RUN: llvm-xray account -d -recursive-calls-only %s -o - -m %S/Inputs/simple-instrmap.yaml | FileCheck --check-prefixes=RECURSIVE %s
+# RUN: llvm-xray account -d %s -m %S/Inputs/simple-instrmap.yaml | FileCheck --check-prefixes=ALL %s
+# RUN: llvm-xray account -d --recursive-calls-only %s -m %S/Inputs/simple-instrmap.yaml | FileCheck --check-prefixes=RECURSIVE %s
---
header:
diff --git a/llvm/test/tools/llvm-xray/X86/account-recursive-calls-only.yaml b/llvm/test/tools/llvm-xray/X86/account-recursive-calls-only.yaml
index d7b36200d10d3..d3b2d11d52a38 100644
--- a/llvm/test/tools/llvm-xray/X86/account-recursive-calls-only.yaml
+++ b/llvm/test/tools/llvm-xray/X86/account-recursive-calls-only.yaml
@@ -1,5 +1,5 @@
-# RUN: llvm-xray account %s -o - -m %S/Inputs/simple-instrmap.yaml | FileCheck --check-prefixes=ALL %s
-# RUN: llvm-xray account -recursive-calls-only %s -o - -m %S/Inputs/simple-instrmap.yaml | FileCheck --check-prefixes=RECURSIVE %s
+# RUN: llvm-xray account %s -m %S/Inputs/simple-instrmap.yaml | FileCheck --check-prefixes=ALL %s
+# RUN: llvm-xray account --recursive-calls-only %s -m %S/Inputs/simple-instrmap.yaml | FileCheck --check-prefixes=RECURSIVE %s
---
header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt b/llvm/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt
index 52ec12550a3d3..1ac24e18949e3 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/naive-with-arg1-entries.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert %S/Inputs/naive-with-arg1-entries.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-basic-log-arg1-version3-to-yaml.txt b/llvm/test/tools/llvm-xray/X86/convert-basic-log-arg1-version3-to-yaml.txt
index 84c757c2b2639..cdddbbc45c369 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-basic-log-arg1-version3-to-yaml.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-basic-log-arg1-version3-to-yaml.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/basic-log-arg1-version-3.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert %S/Inputs/basic-log-arg1-version-3.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-basic-log-version3-to-yaml.txt b/llvm/test/tools/llvm-xray/X86/convert-basic-log-version3-to-yaml.txt
index d2af2fc09c2eb..a545932200a44 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-basic-log-version3-to-yaml.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-basic-log-version3-to-yaml.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/basic-log-version-3.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert %S/Inputs/basic-log-version-3.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-fdr-arg1-to-yaml.txt b/llvm/test/tools/llvm-xray/X86/convert-fdr-arg1-to-yaml.txt
index 592796434bd83..6f4716b01ec3f 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-fdr-arg1-to-yaml.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-fdr-arg1-to-yaml.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/fdr-log-arg1.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert %S/Inputs/fdr-log-arg1.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-fdr-log-arg1-version3-to-yaml.txt b/llvm/test/tools/llvm-xray/X86/convert-fdr-log-arg1-version3-to-yaml.txt
index afeac68fa3dac..594bf01945c70 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-fdr-log-arg1-version3-to-yaml.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-fdr-log-arg1-version3-to-yaml.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/fdr-log-arg1-version-3.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert %S/Inputs/fdr-log-arg1-version-3.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-fdr-log-version3-to-yaml.txt b/llvm/test/tools/llvm-xray/X86/convert-fdr-log-version3-to-yaml.txt
index fc70015c41e87..53edc3a3c16ff 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-fdr-log-version3-to-yaml.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-fdr-log-version3-to-yaml.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/fdr-log-version-3.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert %S/Inputs/fdr-log-version-3.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-fdr-to-traceevent.txt b/llvm/test/tools/llvm-xray/X86/convert-fdr-to-traceevent.txt
index 2e845ab3aa92a..99b4791ca5f44 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-fdr-to-traceevent.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-fdr-to-traceevent.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/fdr-log-version-1.xray -f=trace_event -o - \
+; RUN: llvm-xray convert %S/Inputs/fdr-log-version-1.xray -f trace_event -o - \
; RUN: | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
; RUN: | FileCheck %s
diff --git a/llvm/test/tools/llvm-xray/X86/convert-fdr-to-yaml.txt b/llvm/test/tools/llvm-xray/X86/convert-fdr-to-yaml.txt
index 99bc7e11b97b8..cfe0126d9e256 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-fdr-to-yaml.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-fdr-to-yaml.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/fdr-log-version-1.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert %S/Inputs/fdr-log-version-1.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-roundtrip.yaml b/llvm/test/tools/llvm-xray/X86/convert-roundtrip.yaml
index bbebd67e57611..44702ace87fc5 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-roundtrip.yaml
+++ b/llvm/test/tools/llvm-xray/X86/convert-roundtrip.yaml
@@ -1,4 +1,4 @@
-#RUN: llvm-xray convert %s -f=raw -o %t && llvm-xray convert %t -f=yaml -o - | FileCheck %s
+#RUN: llvm-xray convert %s -f raw -o %t && llvm-xray convert %t -f yaml -o - | FileCheck %s
---
header:
version: 1
diff --git a/llvm/test/tools/llvm-xray/X86/convert-to-yaml.txt b/llvm/test/tools/llvm-xray/X86/convert-to-yaml.txt
index f807fae3a64c5..93c22826294de 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-to-yaml.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-to-yaml.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert %S/Inputs/naive-log-simple.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert %S/Inputs/naive-log-simple.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-traceevent-special-events.txt b/llvm/test/tools/llvm-xray/X86/convert-traceevent-special-events.txt
index 1693a4213a1b2..eb8fee7236847 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-traceevent-special-events.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-traceevent-special-events.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-xray convert %s -f=trace_event -o - \
+# RUN: llvm-xray convert %s -f trace_event -o - \
# RUN: | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
# RUN: | FileCheck %s
---
diff --git a/llvm/test/tools/llvm-xray/X86/convert-with-debug-syms.txt b/llvm/test/tools/llvm-xray/X86/convert-with-debug-syms.txt
index dbb98e3d3cf05..dd601486b2fb1 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-with-debug-syms.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-with-debug-syms.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert -m %S/Inputs/elf64-sample-o2.bin -y %S/Inputs/naive-log-simple.xray -f=yaml -o - 2>&1 | FileCheck %s
+; RUN: llvm-xray convert -m %S/Inputs/elf64-sample-o2.bin -y %S/Inputs/naive-log-simple.xray -f yaml -o - 2>&1 | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt b/llvm/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt
index 9a1218256565e..5c8e8e4cb5ccf 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-with-standalone-instrmap.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert -m %S/Inputs/elf64-objcopied-instrmap.bin -y %S/Inputs/naive-log-simple.xray -f=yaml -o - 2>&1 | FileCheck %s
+; RUN: llvm-xray convert -m %S/Inputs/elf64-objcopied-instrmap.bin -y %S/Inputs/naive-log-simple.xray -f yaml -o - 2>&1 | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt b/llvm/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt
index 1efcb3572bad8..d705ee25d2264 100644
--- a/llvm/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt
+++ b/llvm/test/tools/llvm-xray/X86/convert-with-yaml-instrmap.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray convert -m %S/Inputs/simple-xray-instrmap.yaml %S/Inputs/naive-log-simple.xray -f=yaml -o - | FileCheck %s
+; RUN: llvm-xray convert -m %S/Inputs/simple-xray-instrmap.yaml %S/Inputs/naive-log-simple.xray -f yaml -o - | FileCheck %s
; CHECK: ---
; CHECK-NEXT: header:
diff --git a/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt b/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt
index ccb8a1b0538b7..7288c320c1b46 100644
--- a/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt
+++ b/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1-version-3.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray fdr-dump -verify %S/Inputs/fdr-log-arg1-version-3.xray \
+; RUN: llvm-xray fdr-dump --verify %S/Inputs/fdr-log-arg1-version-3.xray \
; RUN: | FileCheck %s
; CHECK: [New Block]
diff --git a/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt b/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt
index 8fb381a170c32..f49bd3f7036c1 100644
--- a/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt
+++ b/llvm/test/tools/llvm-xray/X86/fdr-dump-arg1.txt
@@ -1,4 +1,4 @@
-; RUN: llvm-xray fdr-dump -verify %S/Inputs/fdr-log-arg1.xray | FileCheck %s
+; RUN: llvm-xray fdr-dump --verify %S/Inputs/fdr-log-arg1.xray | FileCheck %s
; CHECK: [New Block]
; CHECK-NEXT: Preamble:
diff --git a/llvm/test/tools/llvm-xray/X86/stack-multithread.yaml b/llvm/test/tools/llvm-xray/X86/stack-multithread.yaml
index 95be7f770817b..ce8ffce62c24f 100644
--- a/llvm/test/tools/llvm-xray/X86/stack-multithread.yaml
+++ b/llvm/test/tools/llvm-xray/X86/stack-multithread.yaml
@@ -1,5 +1,5 @@
-#RUN: llvm-xray stack -per-thread-stacks %s | FileCheck %s --check-prefix PER-THREAD
-#RUN: llvm-xray stack -aggregate-threads %s | FileCheck %s --check-prefix AGGREGATE
+#RUN: llvm-xray stack --per-thread-stacks %s | FileCheck %s --check-prefix PER-THREAD
+#RUN: llvm-xray stack --aggregate-threads %s | FileCheck %s --check-prefix AGGREGATE
---
header:
More information about the llvm-commits
mailing list