Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcxx/test/libcxx/vendor/ibm/bad_function_call.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove the vendor in the vendor specific directory?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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{{.*}}.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

// ADDITIONAL_COMPILE_FLAGS: -fvisibility-inlines-hidden

// When there is a weak hidden symbol in user code and a strong definition
Expand Down
2 changes: 1 addition & 1 deletion libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_32.pass.sh.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
2 changes: 1 addition & 1 deletion libcxxabi/test/vendor/ibm/aix_xlclang_nested_excp_64.pass.sh.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
2 changes: 1 addition & 1 deletion libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_32.pass.sh.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion libcxxabi/test/vendor/ibm/aix_xlclang_passing_excp_obj_64.pass.sh.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion libcxxabi/test/vendor/ibm/cond_reg_restore.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{{.*}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why drop the vendor in the vendor specific directory?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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{{.*}}.

// ADDITIONAL_COMPILE_FLAGS: -O3
// UNSUPPORTED: no-exceptions

Expand Down
2 changes: 1 addition & 1 deletion libcxxabi/test/vendor/ibm/vec_reg_restore.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{{.*}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise

// ADDITIONAL_COMPILE_FLAGS: -mabi=vec-extabi
// UNSUPPORTED: no-exceptions

Expand Down
2 changes: 1 addition & 1 deletion libunwind/test/aix_signal_unwind.pass.sh.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading