[NFC][libc++][libc++abi][libunwind][test] Fix/unify AIX triples used in LIT tests #101196

xingxue-ibm · 2024-07-30T15:24:34Z

This patch fixes/unifies AIX target triples used in libc++, libc++abi, and libunwind LIT tests.

llvmbot · 2024-07-30T15:25:08Z

@llvm/pr-subscribers-libcxxabi

@llvm/pr-subscribers-libcxx

Author: Xing Xue (xingxue-ibm)

Changes

This patch fixes/unifies AIX target triples used in libc++, libc++abi, and libunwind LIT tests.

Full diff: https://github.com/llvm/llvm-project/pull/101196.diff

8 Files Affected:

(modified) libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp (+1-1)
(modified) libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s (+1-1)
(modified) libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s (+1-1)
(modified) libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S (+1-1)
(modified) libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S (+1-1)
(modified) libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp (+1-1)
(modified) libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp (+1-1)
(modified) libunwind/test/aix_signal_unwind.pass.sh.S (+1-1)

diff --git a/libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp b/libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp
index 2b684465650fa..3714e4037a2dc 100644
--- a/libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp
+++ b/libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: target={{powerpc.*-ibm-aix.*}}
+// REQUIRES: target={{.+}}-aix{{.*}}
 // ADDITIONAL_COMPILE_FLAGS: -fvisibility-inlines-hidden
 
 // When there is a weak hidden symbol in user code and a strong definition
diff --git a/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s b/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s
index ce90045586082..b35c999e6e50d 100644
--- a/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s
+++ b/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s
@@ -9,7 +9,7 @@
 # Test that a nested exception is thrown by a destructor inside a try-block
 # when the code is generated by the legacy AIX xlclang compiler.
 
-# REQUIRES: target=powerpc-ibm-aix
+# REQUIRES: target=powerpc-ibm-aix{{.*}}
 # UNSUPPORTED: no-exceptions
 
 # RUN: %{cxx} %{flags} %s %{link_flags} \
diff --git a/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s b/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s
index 7b0afb9ebae38..16754db2837ca 100644
--- a/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s
+++ b/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s
@@ -8,7 +8,7 @@
 # Test that a nested exception is thrown by a destructor inside a try-block
 # when the code is generated by the legacy AIX xlclang compiler.
 
-# REQUIRES: target=powerpc64-ibm-aix
+# REQUIRES: target=powerpc64-ibm-aix{{.*}}
 # UNSUPPORTED: no-exceptions
 
 # RUN: %{cxx} %{flags} %s %{link_flags} \
diff --git a/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S b/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S
index 71c3ab9409a81..8b92e4febf562 100644
--- a/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S
+++ b/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S
@@ -14,7 +14,7 @@
 // xlclang++ compiler included in this file. This file tests for the 32-bit
 // mode.
 
-# REQUIRES: target=powerpc-ibm-aix
+# REQUIRES: target=powerpc-ibm-aix{{.*}}
 # UNSUPPORTED: no-exceptions
 
 // RUN: %{cxx} -c %s -o %t1_32.o -DT1_CPP_CODE %{flags} %{compile_flags}
diff --git a/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S b/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S
index da413577bd38f..64d7c80e9e6dd 100644
--- a/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S
+++ b/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S
@@ -14,7 +14,7 @@
 // xlclang++ compiler included in this file. This file tests for the 64-bit
 // mode.
 
-# REQUIRES: target=powerpc64-ibm-aix
+# REQUIRES: target=powerpc64-ibm-aix{{.*}}
 # UNSUPPORTED: no-exceptions
 
 // RUN: %{cxx} -c %s -o %t1_64.o -DT1_CPP_CODE %{flags} %{compile_flags}
diff --git a/libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp b/libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp
index 63817e1b13a25..a5eb3c20534a3 100644
--- a/libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp
+++ b/libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp
@@ -10,7 +10,7 @@
 // on AIX. Option -O3 is required so that the compiler will re-use the value
 // in the condition register instead of re-evaluating the condition expression.
 
-// REQUIRES: target=powerpc{{(64)?}}-ibm-aix
+// REQUIRES: target={{.+}}-aix{{.*}}
 // ADDITIONAL_COMPILE_FLAGS: -O3
 // UNSUPPORTED: no-exceptions
 
diff --git a/libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp b/libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp
index 703c311dae392..7c31970546993 100644
--- a/libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp
+++ b/libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp
@@ -9,7 +9,7 @@
 // Check that the PowerPC vector registers are restored properly during
 // unwinding. Option -mabi=vec-extabi is required to compile the test case.
 
-// REQUIRES: target=powerpc{{(64)?}}-ibm-aix
+// REQUIRES: target={{.+}}-aix{{.*}}
 // ADDITIONAL_COMPILE_FLAGS: -mabi=vec-extabi
 // UNSUPPORTED: no-exceptions
 
diff --git a/libunwind/test/aix_signal_unwind.pass.sh.S b/libunwind/test/aix_signal_unwind.pass.sh.S
index a666577d095b1..2c0cf140fe267 100644
--- a/libunwind/test/aix_signal_unwind.pass.sh.S
+++ b/libunwind/test/aix_signal_unwind.pass.sh.S
@@ -10,7 +10,7 @@
 // a correct traceback when the function raising the signal does not save
 // the link register or does not store the stack back chain.
 
-// REQUIRES: target=powerpc{{(64)?}}-ibm-aix{{.*}}
+// REQUIRES: target={{.+}}-aix{{.*}}
 
 // Test when the function raising the signal does not save the link register
 // RUN: %{cxx} -x c++ %s -o %t.exe -DCXX_CODE %{flags} %{compile_flags}

llvmbot · 2024-07-30T15:25:08Z

@llvm/pr-subscribers-libunwind

Author: Xing Xue (xingxue-ibm)

Changes

This patch fixes/unifies AIX target triples used in libc++, libc++abi, and libunwind LIT tests.

Full diff: https://github.com/llvm/llvm-project/pull/101196.diff

8 Files Affected:

(modified) libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp (+1-1)
(modified) libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s (+1-1)
(modified) libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s (+1-1)
(modified) libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S (+1-1)
(modified) libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S (+1-1)
(modified) libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp (+1-1)
(modified) libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp (+1-1)
(modified) libunwind/test/aix_signal_unwind.pass.sh.S (+1-1)

diff --git a/libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp b/libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp
index 2b684465650fa..3714e4037a2dc 100644
--- a/libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp
+++ b/libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: target={{powerpc.*-ibm-aix.*}}
+// REQUIRES: target={{.+}}-aix{{.*}}
 // ADDITIONAL_COMPILE_FLAGS: -fvisibility-inlines-hidden
 
 // When there is a weak hidden symbol in user code and a strong definition
diff --git a/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s b/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s
index ce90045586082..b35c999e6e50d 100644
--- a/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s
+++ b/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s
@@ -9,7 +9,7 @@
 # Test that a nested exception is thrown by a destructor inside a try-block
 # when the code is generated by the legacy AIX xlclang compiler.
 
-# REQUIRES: target=powerpc-ibm-aix
+# REQUIRES: target=powerpc-ibm-aix{{.*}}
 # UNSUPPORTED: no-exceptions
 
 # RUN: %{cxx} %{flags} %s %{link_flags} \
diff --git a/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s b/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s
index 7b0afb9ebae38..16754db2837ca 100644
--- a/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s
+++ b/libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s
@@ -8,7 +8,7 @@
 # Test that a nested exception is thrown by a destructor inside a try-block
 # when the code is generated by the legacy AIX xlclang compiler.
 
-# REQUIRES: target=powerpc64-ibm-aix
+# REQUIRES: target=powerpc64-ibm-aix{{.*}}
 # UNSUPPORTED: no-exceptions
 
 # RUN: %{cxx} %{flags} %s %{link_flags} \
diff --git a/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S b/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S
index 71c3ab9409a81..8b92e4febf562 100644
--- a/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S
+++ b/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S
@@ -14,7 +14,7 @@
 // xlclang++ compiler included in this file. This file tests for the 32-bit
 // mode.
 
-# REQUIRES: target=powerpc-ibm-aix
+# REQUIRES: target=powerpc-ibm-aix{{.*}}
 # UNSUPPORTED: no-exceptions
 
 // RUN: %{cxx} -c %s -o %t1_32.o -DT1_CPP_CODE %{flags} %{compile_flags}
diff --git a/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S b/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S
index da413577bd38f..64d7c80e9e6dd 100644
--- a/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S
+++ b/libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S
@@ -14,7 +14,7 @@
 // xlclang++ compiler included in this file. This file tests for the 64-bit
 // mode.
 
-# REQUIRES: target=powerpc64-ibm-aix
+# REQUIRES: target=powerpc64-ibm-aix{{.*}}
 # UNSUPPORTED: no-exceptions
 
 // RUN: %{cxx} -c %s -o %t1_64.o -DT1_CPP_CODE %{flags} %{compile_flags}
diff --git a/libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp b/libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp
index 63817e1b13a25..a5eb3c20534a3 100644
--- a/libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp
+++ b/libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp
@@ -10,7 +10,7 @@
 // on AIX. Option -O3 is required so that the compiler will re-use the value
 // in the condition register instead of re-evaluating the condition expression.
 
-// REQUIRES: target=powerpc{{(64)?}}-ibm-aix
+// REQUIRES: target={{.+}}-aix{{.*}}
 // ADDITIONAL_COMPILE_FLAGS: -O3
 // UNSUPPORTED: no-exceptions
 
diff --git a/libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp b/libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp
index 703c311dae392..7c31970546993 100644
--- a/libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp
+++ b/libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp
@@ -9,7 +9,7 @@
 // Check that the PowerPC vector registers are restored properly during
 // unwinding. Option -mabi=vec-extabi is required to compile the test case.
 
-// REQUIRES: target=powerpc{{(64)?}}-ibm-aix
+// REQUIRES: target={{.+}}-aix{{.*}}
 // ADDITIONAL_COMPILE_FLAGS: -mabi=vec-extabi
 // UNSUPPORTED: no-exceptions
 
diff --git a/libunwind/test/aix_signal_unwind.pass.sh.S b/libunwind/test/aix_signal_unwind.pass.sh.S
index a666577d095b1..2c0cf140fe267 100644
--- a/libunwind/test/aix_signal_unwind.pass.sh.S
+++ b/libunwind/test/aix_signal_unwind.pass.sh.S
@@ -10,7 +10,7 @@
 // a correct traceback when the function raising the signal does not save
 // the link register or does not store the stack back chain.
 
-// REQUIRES: target=powerpc{{(64)?}}-ibm-aix{{.*}}
+// REQUIRES: target={{.+}}-aix{{.*}}
 
 // Test when the function raising the signal does not save the link register
 // RUN: %{cxx} -x c++ %s -o %t.exe -DCXX_CODE %{flags} %{compile_flags}

compnerd · 2024-07-30T15:26:18Z

libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// REQUIRES: target={{powerpc.*-ibm-aix.*}}
+// REQUIRES: target={{.+}}-aix{{.*}}


Why remove the vendor in the vendor specific directory?

Why remove the vendor in the vendor specific directory?

IBM is the only vendor shipping the AIX OS so I think the vendor part is unnecessary. This is similar to {{.+}}-zos{{.*}}.

But then we should be able to hoist these tests out of the vendor/ibm directory and into the general test set? Perhaps @ldionne has opinions on this.

I see what you mean, thanks! I can do it if we think it is better to move them out of the vendor/ibm directory.

libcxx/test/vendor is a bit mis-named, I guess. It's more like libcxx/test/vendor-or-extremely-platform-specific-stuff. I think it makes more sense to keep this here since this test doesn't make sense outside of AIX.

compnerd · 2024-07-30T15:26:37Z

libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp

@@ -10,7 +10,7 @@
 // on AIX. Option -O3 is required so that the compiler will re-use the value
 // in the condition register instead of re-evaluating the condition expression.

-// REQUIRES: target=powerpc{{(64)?}}-ibm-aix
+// REQUIRES: target={{.+}}-aix{{.*}}


Why drop the vendor in the vendor specific directory?

Why drop the vendor in the vendor specific directory?

IBM is the only vendor shipping the AIX OS so I think the vendor part is unnecessary. This is similar to {{.+}}-zos{{.*}}.

compnerd · 2024-07-30T15:26:44Z

libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp

@@ -9,7 +9,7 @@
 // Check that the PowerPC vector registers are restored properly during
 // unwinding. Option -mabi=vec-extabi is required to compile the test case.

-// REQUIRES: target=powerpc{{(64)?}}-ibm-aix
+// REQUIRES: target={{.+}}-aix{{.*}}


ldionne · 2024-07-31T13:50:44Z

libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// REQUIRES: target={{powerpc.*-ibm-aix.*}}
+// REQUIRES: target={{.+}}-aix{{.*}}


libcxx/test/vendor is a bit mis-named, I guess. It's more like libcxx/test/vendor-or-extremely-platform-specific-stuff. I think it makes more sense to keep this here since this test doesn't make sense outside of AIX.

xingxue-ibm · 2024-08-01T15:10:35Z

/cherry-pick 2d36550

llvmbot · 2024-08-01T15:15:25Z

Failed to cherry-pick: 2d36550

https://github.com/llvm/llvm-project/actions/runs/10200934511

Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request

…in LIT tests (llvm#101196) This patch fixes/unifies AIX target triples used in libc++, libc++abi, and libunwind LIT tests. (cherry picked from commit 2d36550)

Fix the AIX triples used in LIT tests.

d3fb26a

xingxue-ibm requested review from compnerd, ldionne, mordante and daltenty July 30, 2024 15:24

xingxue-ibm self-assigned this Jul 30, 2024

xingxue-ibm requested review from a team as code owners July 30, 2024 15:24

llvmbot added libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. libc++abi libc++abi C++ Runtime Library. Not libc++. libunwind labels Jul 30, 2024

compnerd reviewed Jul 30, 2024

View reviewed changes

ldionne approved these changes Jul 31, 2024

View reviewed changes

xingxue-ibm merged commit 2d36550 into llvm:main Aug 1, 2024
61 checks passed

xingxue-ibm added this to the LLVM 19.X Release milestone Aug 1, 2024

llvmbot added the release:cherry-pick-failed label Aug 1, 2024

philnik777 mentioned this pull request Aug 2, 2024

[Clang] Add a release note deprecating __is_nullptr #101638

Merged

mgabka mentioned this pull request Aug 22, 2024

Add release note about ABI mgabka/llvm-project#6

Open

thewtex mentioned this pull request Feb 10, 2025

llvmorg 19.1.5 libcxxabi pthread lib name #126605

Closed

xingxue-ibm deleted the lit-aix-triple branch April 1, 2025 20:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[NFC][libc++][libc++abi][libunwind][test] Fix/unify AIX triples used in LIT tests #101196

[NFC][libc++][libc++abi][libunwind][test] Fix/unify AIX triples used in LIT tests #101196

Uh oh!

xingxue-ibm commented Jul 30, 2024

Uh oh!

llvmbot commented Jul 30, 2024 •

edited

Loading

Uh oh!

llvmbot commented Jul 30, 2024

Uh oh!

compnerd Jul 30, 2024

Uh oh!

xingxue-ibm Jul 30, 2024

Uh oh!

compnerd Jul 30, 2024

Uh oh!

xingxue-ibm Jul 30, 2024

Uh oh!

ldionne Jul 31, 2024

Uh oh!

xingxue-ibm Jul 31, 2024

Uh oh!

compnerd Jul 30, 2024

Uh oh!

xingxue-ibm Jul 30, 2024

Uh oh!

compnerd Jul 30, 2024

Uh oh!

ldionne Jul 31, 2024

Uh oh!

Uh oh!

xingxue-ibm commented Aug 1, 2024

Uh oh!

llvmbot commented Aug 1, 2024

Uh oh!

Uh oh!

[NFC][libc++][libc++abi][libunwind][test] Fix/unify AIX triples used in LIT tests #101196

[NFC][libc++][libc++abi][libunwind][test] Fix/unify AIX triples used in LIT tests #101196

Uh oh!

Conversation

xingxue-ibm commented Jul 30, 2024

Uh oh!

llvmbot commented Jul 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Jul 30, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xingxue-ibm commented Aug 1, 2024

Uh oh!

llvmbot commented Aug 1, 2024

Uh oh!

Uh oh!

llvmbot commented Jul 30, 2024 •

edited

Loading