[libc++][AIX] Add OS version to target triple

[Jake-Egan]

Summary

This will allow for configuring tests according to AIX version.

[ldionne]

libcxx/utils/ci/run-buildbot

656 ↗

(On Diff #518763)

Normally, the target triple is figured out automatically in the CMake code. I think it's LLVM_DEFAULT_TARGET_TRIPLE. Is there a reason why that triple isn't inferred properly? If it were, I think this would not be necessary.

[Jake-Egan]

Get full AIX version

[Jake-Egan]

libcxx/utils/ci/run-buildbot

656 ↗

(On Diff #518763)

We considered adding the AIX version to the triple in the driver, but we don't have a good way to retrieve the AIX version in the driver right now. So, we prefer to do it in the test-suite to avoid any potential problems.

[Mordante]

In D149660#4625392, @Jake-Egan wrote:

Get full AIX version

Note that the AIX build is not available at the moment. I'll mark this as needs work so it can be rebased once the builder is available again.

[Jake-Egan]

rebase

[Jake-Egan]

It looks like this PR isn't configured right to run the libc++ CI

[Mordante]

This seems to be the libc++ run https://buildkite.com/llvm-project/libcxx-ci/builds/29326

I'm not sure why it also runs other CIs, but that might be due to recent experiments. Maybe rebasing will solve the issue.

libcxx/utils/ci/run-buildbot

656 ↗

(On Diff #518763)

Can you add some comment to explain this?

[Jake-Egan]

Added a comment and rebase

[Jake-Egan]

rebase

[Jake-Egan]

Ping

[daltenty]

libcxx/utils/ci/run-buildbot

711 ↗

(On Diff #557109)

Hmm, I wonder if this script is really the right place for this. If you don't go through this script to do the build, or the environment like this var isn't properly set when you run it, you won't get a correct test run result.

I think it would be better if this was implemented somewhere inside the lit config somehow.

[Jake-Egan]

libcxx/utils/ci/run-buildbot

711 ↗

(On Diff #557109)

I will look into this

[Jake-Egan]

Use the lit config instead

[Jake-Egan]

Trigger CI

[Jake-Egan]

Trigger CI

[daltenty]

libcxx/test/configs/ibm-libc++-shared.cfg.in

10

You need some kind of guard so we don't run this block on non-AIX platforms

[Jake-Egan]

• Guard for AIX

[daltenty]

libcxx/test/configs/ibm-libc++-shared.cfg.in

7

Maybe you can make this a utility function inside llvm/utils/lit/lit/util.py to avoid repeating the code?

(There are similarish util functions for macos for example)

[daltenty]

libcxx/test/configs/ibm-libc++-shared.cfg.in

7

I'm confused, why not move this whole complicated function? (You've only moved the target check)

[daltenty]

LGTM, thanks!

[Mordante]

LGTM modulo one nit.

llvm/utils/lit/lit/util.py

13

Nit: Please keep the imports in alphabetic order.

libcxx/test/configs/ibm-libc++-shared.cfg.in

 
 lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
 
+import lit.util
+if lit.util.isAIXTriple(config.target_triple):
+  # Add the AIX version to the triple here because there currently isn't a good
+  # way to retrieve the AIX version in the driver.
+  config.target_triple = lit.util.addAIXVersion(config.target_triple)
+
 config.substitutions.append(('%{flags}', '-pthread'))
 config.substitutions.append(('%{compile_flags}',
     '-nostdinc++ -D__LIBC_NO_CPP_MATH_OVERLOADS__ -I %{include} -I %{libcxx}/test/support'

libcxxabi/test/configs/ibm-libc++abi-shared.cfg.in

 
 lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
 
+import lit.util
+if lit.util.isAIXTriple(config.target_triple):
+  # Add the AIX version to the triple here because there currently isn't a good
+  # way to retrieve the AIX version in the driver.
+  config.target_triple = lit.util.addAIXVersion(config.target_triple)
+
 config.substitutions.append(('%{flags}',''))
 config.substitutions.append(('%{compile_flags}',
     '-nostdinc++ -I %{include} -I %{cxx-include} -I %{cxx-target-include} %{maybe-include-libunwind} ' +

libunwind/test/configs/ibm-libunwind-shared.cfg.in

 
 lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
 
+import lit.util
+if lit.util.isAIXTriple(config.target_triple):
+  # Add the AIX version to the triple here because there currently isn't a good
+  # way to retrieve the AIX version in the driver.
+  config.target_triple = lit.util.addAIXVersion(config.target_triple)
+
 config.substitutions.append(('%{flags}', ''))
 config.substitutions.append(('%{compile_flags}',
     '-nostdinc++ -I %{include}'

libunwind/test/signal_frame.pass.cpp

 
 // The AIX assembler does not support CFI directives, which
 // are necessary to run this test.
-// UNSUPPORTED: target=powerpc{{(64)?}}-ibm-aix
+// UNSUPPORTED: target={{.*}}-aix{{.*}}
 
 // Windows doesn't generally use CFI directives. However, i686
 // mingw targets do use DWARF (where CFI directives are supported).

llvm/utils/lit/lit/util.py

 import subprocess
 import sys
 import threading
+import re
 
 
 def is_string(value):

     return out, err, exitCode
 
 
+def isAIXTriple(target_triple):
+    """Whether the given target triple is for AIX,
+    e.g. powerpc64-ibm-aix
+    """
+    return "aix" in target_triple
+
+
+def addAIXVersion(target_triple):
+    """Add the AIX version to the given target triple,
+    e.g. powerpc64-ibm-aix7.2.5.6
+    """
+    os_cmd = "oslevel -s | awk -F\'-\' \'{printf \"%.1f.%d.%d\", $1/1000, $2, $3}\'"
+    os_version = subprocess.run(os_cmd, capture_output=True, shell=True).stdout.decode()
+    return re.sub("aix", "aix" + os_version, target_triple)
+
+
 def isMacOSTriple(target_triple):
     """Whether the given target triple is for macOS,
     e.g. x86_64-apple-darwin, arm64-apple-macos