[llvm] [Fix] Fix DWARF CFI checker tests execution on Mac (PR #147638)
AmirHossein PashaeeHir via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 8 22:59:34 PDT 2025
https://github.com/amsen20 updated https://github.com/llvm/llvm-project/pull/147638
>From ba26359ba7ea4aa9b987473991d74a9d2b9c5cbc Mon Sep 17 00:00:00 2001
From: Amirhossein Pashaeehir <amirhosseinp at google.com>
Date: Wed, 9 Jul 2025 02:17:50 +0000
Subject: [PATCH 1/2] Replace x86_64-pc-linux-gnu with x86_64-unknown-unknown
---
llvm/test/DWARFCFIChecker/X86/cfa-corner-cases.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/empty-nested-frames.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/empty-section.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/multiple-sections.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/nested-frames.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/single-func-cfa-mistake.s | 4 ++--
.../DWARFCFIChecker/X86/single-func-missed-cfi-directive.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/single-func.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/spill-two-reg-reversed.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/spill-two-reg.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/unsupported-directives.s | 4 ++--
llvm/test/DWARFCFIChecker/X86/update-with-no-cfi.s | 4 ++--
12 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/llvm/test/DWARFCFIChecker/X86/cfa-corner-cases.s b/llvm/test/DWARFCFIChecker/X86/cfa-corner-cases.s
index 94a847a969623..e9ae5a29d006f 100644
--- a/llvm/test/DWARFCFIChecker/X86/cfa-corner-cases.s
+++ b/llvm/test/DWARFCFIChecker/X86/cfa-corner-cases.s
@@ -1,5 +1,5 @@
-# RUN: not llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: not llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.globl f
diff --git a/llvm/test/DWARFCFIChecker/X86/empty-nested-frames.s b/llvm/test/DWARFCFIChecker/X86/empty-nested-frames.s
index cbc0689721201..dd0f898f207c0 100644
--- a/llvm/test/DWARFCFIChecker/X86/empty-nested-frames.s
+++ b/llvm/test/DWARFCFIChecker/X86/empty-nested-frames.s
@@ -1,6 +1,6 @@
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s --allow-empty --implicit-check-not warning: --implicit-check-not error:
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s --allow-empty --implicit-check-not warning: --implicit-check-not error:
## TODO: `--allow-empty` should be erased and replaced with a simple check for the asm output when `--filetype=asm` is implemented for `--validate-cfi`.
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .section
.pushsection A
f:
diff --git a/llvm/test/DWARFCFIChecker/X86/empty-section.s b/llvm/test/DWARFCFIChecker/X86/empty-section.s
index 8000bbf6d8e02..f14cb964b7607 100644
--- a/llvm/test/DWARFCFIChecker/X86/empty-section.s
+++ b/llvm/test/DWARFCFIChecker/X86/empty-section.s
@@ -1,6 +1,6 @@
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s --allow-empty --implicit-check-not warning: --implicit-check-not error:
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s --allow-empty --implicit-check-not warning: --implicit-check-not error:
## TODO: `--allow-empty` should be erased and replaced with a simple check for the asm output when `--filetype=asm` is implemented for `--validate-cfi`.
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.globl f
diff --git a/llvm/test/DWARFCFIChecker/X86/multiple-sections.s b/llvm/test/DWARFCFIChecker/X86/multiple-sections.s
index 394be6f7eedb3..5124fd96c32c2 100644
--- a/llvm/test/DWARFCFIChecker/X86/multiple-sections.s
+++ b/llvm/test/DWARFCFIChecker/X86/multiple-sections.s
@@ -1,5 +1,5 @@
-# RUN: not llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: not llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.globl f
diff --git a/llvm/test/DWARFCFIChecker/X86/nested-frames.s b/llvm/test/DWARFCFIChecker/X86/nested-frames.s
index d7f7fa8f58ce2..52eb6f8844f58 100644
--- a/llvm/test/DWARFCFIChecker/X86/nested-frames.s
+++ b/llvm/test/DWARFCFIChecker/X86/nested-frames.s
@@ -1,5 +1,5 @@
-# RUN: not llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: not llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .section
.pushsection A
f:
diff --git a/llvm/test/DWARFCFIChecker/X86/single-func-cfa-mistake.s b/llvm/test/DWARFCFIChecker/X86/single-func-cfa-mistake.s
index 97726ef0a50b6..fa81e9d485886 100644
--- a/llvm/test/DWARFCFIChecker/X86/single-func-cfa-mistake.s
+++ b/llvm/test/DWARFCFIChecker/X86/single-func-cfa-mistake.s
@@ -1,5 +1,5 @@
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.globl f
diff --git a/llvm/test/DWARFCFIChecker/X86/single-func-missed-cfi-directive.s b/llvm/test/DWARFCFIChecker/X86/single-func-missed-cfi-directive.s
index 7596250124ac7..292b66e6d489f 100644
--- a/llvm/test/DWARFCFIChecker/X86/single-func-missed-cfi-directive.s
+++ b/llvm/test/DWARFCFIChecker/X86/single-func-missed-cfi-directive.s
@@ -1,5 +1,5 @@
-# RUN: not llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: not llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.globl f
diff --git a/llvm/test/DWARFCFIChecker/X86/single-func.s b/llvm/test/DWARFCFIChecker/X86/single-func.s
index 2d44da9958321..20f1e4d7cac47 100644
--- a/llvm/test/DWARFCFIChecker/X86/single-func.s
+++ b/llvm/test/DWARFCFIChecker/X86/single-func.s
@@ -1,5 +1,5 @@
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.globl f
diff --git a/llvm/test/DWARFCFIChecker/X86/spill-two-reg-reversed.s b/llvm/test/DWARFCFIChecker/X86/spill-two-reg-reversed.s
index babd8123b885f..b36aa5457af6c 100644
--- a/llvm/test/DWARFCFIChecker/X86/spill-two-reg-reversed.s
+++ b/llvm/test/DWARFCFIChecker/X86/spill-two-reg-reversed.s
@@ -1,5 +1,5 @@
-# RUN: not llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: not llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.type _start, at function
diff --git a/llvm/test/DWARFCFIChecker/X86/spill-two-reg.s b/llvm/test/DWARFCFIChecker/X86/spill-two-reg.s
index a0015e1256f26..07cae53a58723 100644
--- a/llvm/test/DWARFCFIChecker/X86/spill-two-reg.s
+++ b/llvm/test/DWARFCFIChecker/X86/spill-two-reg.s
@@ -1,6 +1,6 @@
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
## TODO: Should check no warnings are emitted but for now, the tool is naive and emitting warnings for every change.
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.type _start, at function
diff --git a/llvm/test/DWARFCFIChecker/X86/unsupported-directives.s b/llvm/test/DWARFCFIChecker/X86/unsupported-directives.s
index 9b02b463a0760..3ce5ab6836091 100644
--- a/llvm/test/DWARFCFIChecker/X86/unsupported-directives.s
+++ b/llvm/test/DWARFCFIChecker/X86/unsupported-directives.s
@@ -1,5 +1,5 @@
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.globl f
diff --git a/llvm/test/DWARFCFIChecker/X86/update-with-no-cfi.s b/llvm/test/DWARFCFIChecker/X86/update-with-no-cfi.s
index 18ed0bc6a291a..3ef1745b4f5ee 100644
--- a/llvm/test/DWARFCFIChecker/X86/update-with-no-cfi.s
+++ b/llvm/test/DWARFCFIChecker/X86/update-with-no-cfi.s
@@ -1,5 +1,5 @@
-# RUN: not llvm-mc -triple x86_64-pc-linux-gnu %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
-# RUN: llvm-mc -triple x86_64-pc-linux-gnu %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
+# RUN: not llvm-mc -triple x86_64-unknown-unknown %s --validate-cfi --filetype=null 2>&1 | FileCheck %s
+# RUN: llvm-mc -triple x86_64-unknown-unknown %s --filetype=asm 2>&1 | FileCheck %s -check-prefix=ASSEMBLER --implicit-check-not warning: --implicit-check-not error:
# ASSEMBLER: .text
.text
.globl f
>From 65c2c41e2e7454d50c7d121404d4369b1a6182c2 Mon Sep 17 00:00:00 2001
From: Amirhossein Pashaeehir <amirhosseinp at google.com>
Date: Wed, 9 Jul 2025 05:59:17 +0000
Subject: [PATCH 2/2] Check if the target supports X86 or not
---
llvm/test/DWARFCFIChecker/X86/lit.local.cfg | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 llvm/test/DWARFCFIChecker/X86/lit.local.cfg
diff --git a/llvm/test/DWARFCFIChecker/X86/lit.local.cfg b/llvm/test/DWARFCFIChecker/X86/lit.local.cfg
new file mode 100644
index 0000000000000..42bf50dcc13c3
--- /dev/null
+++ b/llvm/test/DWARFCFIChecker/X86/lit.local.cfg
@@ -0,0 +1,2 @@
+if not "X86" in config.root.targets:
+ config.unsupported = True
More information about the llvm-commits
mailing list