[AIX] use system assembler for assembly files

[shchenz]

Summary

Change to system assembler to compile assembly files even -fintegrated-as is specified.
We don't have a good Clang as for now for assembly files on AIX.

[shchenz]

gentle ping

[qiucf]

clang/lib/Driver/ToolChains/AIX.cpp

427 ↗

(On Diff #514083)

I saw we have a ToolChain::getAssemble() method. Can we use that directly?

clang/test/Driver/aix-assembler.s

1 ↗

(On Diff #514083)

Empty line?

[shchenz]

address @qiucf comments

[shchenz]

gentle ping...

[shchenz]

gentle ping...

[MaskRay]

clang/test/Driver/aix-assembler.s

23 ↗

(On Diff #517011)

I am not sure you need 6 RUN lines to test this. Whether a target uses integrated assembler has an existing test file and you can reuse that.

[shchenz]

update tests

[shchenz]

I am not sure you need 6 RUN lines to test this. Whether a target uses integrated assembler has an existing test file and you can reuse that.

I don't have strong prefer which one we should use, a new file or reuse file. Since you point out, I change to reuse a legacy one in same dir. Please notice that there are some other targets that has their own assembler test file, like mips-as.s, systemz-as.s, arm64-as.s.

[MaskRay]

In D148490#4334476, @shchenz wrote:

I am not sure you need 6 RUN lines to test this. Whether a target uses integrated assembler has an existing test file and you can reuse that.

I don't have strong prefer which one we should use, a new file or reuse file. Since you point out, I change to reuse a legacy one in same dir. Please notice that there are some other targets that has their own assembler test file, like mips-as.s, systemz-as.s, arm64-as.s.

Thanks. It makes sense to check whether reusing a test file (possibly renaming it) makes sense.
https://maskray.me/blog/2021-08-08-toolchain-testing "an existing test can be enhanced"

Some existing tests can be improved. You may improve the testing without cargo culting:)

[shchenz]

gentle ping

[qiucf]

This looks reasonable to me, thanks.

[MaskRay]

clang/test/Driver/target-as.s

1 ↗

(On Diff #521233)

aix-as.c will be more appropriate.

[shchenz]

clang/test/Driver/target-as.s

1 ↗

(On Diff #521233)

Do you mean we change this file to aix-as.s or we change back to previous version? The file target-as.s can not be renamed to aix-as.s, it also contains tests for i386, see the first run line.

[MaskRay]

clang/test/Driver/target-as.s

1 ↗

(On Diff #521233)

You can add the new tests to the existing aix-as.s. The behavior is about assemblers on AIX. aix-as.s seems more appropriate than target-as.s.

[shchenz]

clang/test/Driver/target-as.s

1 ↗

(On Diff #521233)

hmm, we want to use assembly file for test. There is aix-as.c but no aix-as.s.

[MaskRay]

clang/test/Driver/target-as.s

1 ↗

(On Diff #521233)

You can use -x assembler. It's fairly common to use -x c++ xxx.c to test C++ with a C file.

[brad]

What is left for this to be reverted, in the quest to fully enable IAS for AIX?

[shchenz]

What is left for this to be reverted, in the quest to fully enable IAS for AIX?

See XCOFFAsmParser::ParseDirectiveCSect() and I think qual symbol names in AIX assembly(quite common for AIX assembly) can also not be parsed with llvm's asm parser.

clang/lib/Driver/ToolChain.cpp

return Args.hasArg(options::OPT_coverage) ||
          Args.hasFlag(options::OPT_fprofile_arcs, options::OPT_fno_profile_arcs,
                       false);
 }
 
 Tool *ToolChain::SelectTool(const JobAction &JA) const {
   if (D.IsFlangMode() && getDriver().ShouldUseFlangCompiler(JA)) return getFlang();
   if (getDriver().ShouldUseClangCompiler(JA)) return getClang();
   Action::ActionClass AC = JA.getKind();
-  if (AC == Action::AssembleJobClass && useIntegratedAs())
+  if (AC == Action::AssembleJobClass && useIntegratedAs() &&
+      !getTriple().isOSAIX())
     return getClangAs();
   return getTool(AC);
 }
 
 std::string ToolChain::GetFilePath(const char *Name) const {
   return D.GetFilePath(Name, *this);
 }
 

clang/test/Driver/aix-as.c

 // General tests that as(1) invocations on AIX targets are sane. Note that we
 // only test assembler functionalities in this suite.
 
+// Check powerpc-ibm-aix7.1.0.0, system assembler is used for assembly files, 32-bit.
+// RUN: %clang -x assembler %s -### -c -fintegrated-as 2>&1 \
+// RUN:         --target=powerpc-ibm-aix7.1.0.0 \
+// RUN:   | FileCheck --check-prefix=CHECK-AS32 %s
+//
+// RUN: %clang -x assembler %s -### -c 2>&1 -fno-integrated-as \
+// RUN:         --target=powerpc-ibm-aix7.1.0.0 \
+// RUN:   | FileCheck --check-prefix=CHECK-AS32 %s
+
 // Check powerpc-ibm-aix7.1.0.0, 32-bit.
 // RUN: %clang %s -### -c 2>&1 \
 // RUN:         --target=powerpc-ibm-aix7.1.0.0 \
-// RUN:   | FileCheck --check-prefix=CHECK-AS32 %s
+// RUN:   | FileCheck --check-prefixes=CHECK-AS32,CHECK-AS32-CC1 %s
 // CHECK-AS32-NOT: warning:
-// CHECK-AS32: "-cc1" "-triple" "powerpc-ibm-aix7.1.0.0"
+// CHECK-AS32-CC1: "-cc1" "-triple" "powerpc-ibm-aix7.1.0.0"
 // CHECK-AS32: "{{.*}}as{{(.exe)?}}" 
 // CHECK-AS32: "-a32" 
 // CHECK-AS32: "-many" 
 
+// Check powerpc64-ibm-aix7.1.0.0, system assembler is used for assembly files, 64-bit.
+// RUN: %clang -x assembler %s -### -c -fintegrated-as 2>&1 \
+// RUN:         --target=powerpc64-ibm-aix7.1.0.0 \
+// RUN:   | FileCheck --check-prefix=CHECK-AS64 %s
+//
+// RUN: %clang -x assembler %s -### -c -fno-integrated-as 2>&1 \
+// RUN:         --target=powerpc64-ibm-aix7.1.0.0 \
+// RUN:   | FileCheck --check-prefix=CHECK-AS64 %s
+
 // Check powerpc64-ibm-aix7.1.0.0, 64-bit.
 // RUN: %clang %s -### -c 2>&1 \
 // RUN:         --target=powerpc64-ibm-aix7.1.0.0 \
-// RUN:   | FileCheck --check-prefix=CHECK-AS64 %s
+// RUN:   | FileCheck --check-prefixes=CHECK-AS64,CHECK-AS64-CC1 %s
 // CHECK-AS64-NOT: warning:
-// CHECK-AS64: "-cc1" "-triple" "powerpc64-ibm-aix7.1.0.0"
+// CHECK-AS64-CC1: "-cc1" "-triple" "powerpc64-ibm-aix7.1.0.0"
 // CHECK-AS64: "{{.*}}as{{(.exe)?}}" 
 // CHECK-AS64: "-a64" 
 // CHECK-AS64: "-many"
 
 // Check powerpc-ibm-aix7.1.0.0, 32-bit. -Xassembler <arg> option. 
 // RUN: %clang %s -### -c 2>&1 \
 // RUN:         -Xassembler -w \
 // RUN:         --target=powerpc-ibm-aix7.1.0.0 \