[AIX] Disable tests that fail because of no 64-bit XCOFF object file support

[Jake-Egan]

Summary

The modified tests fail because 64-bit XCOFF object files are not currently supported on AIX. This patch disables these tests on 64-bit AIX for now.

This patch is similar to D111887 except the failures on this patch are on a 64-bit build.

[Jake-Egan]

Fix llvm/test/DebugInfo/omit-empty.ll.

[shchenz]

This seems not right. Now we disable too many debug cases for object mode even for 32bit target. Maybe we should test clang (built with --default-target-triple=powerpc64-ibm-aix) after our backend support 64-bit object mode(-filetype=obj)

[Jake-Egan]

Updated patch to XFAIL only on 64-bit.

[Jake-Egan]

Add LLVM :: DebugInfo/attr-btf_type_tag.ll

[jsji]

Can we use UNSUPPORTED instead of XFAIL since it is unsupported?

[Jake-Egan]

In D113049#3140160, @jsji wrote:

Can we use UNSUPPORTED instead of XFAIL since it is unsupported?

If 64-bit XCOFF object files will be supported in the future, I think it makes more sense to use XFAIL because these tests will still be run and pass after implementation.

[lkail]

Is there any way to filter these tests out on AIX in lit.local.cfg?

[jsji]

In D113049#3140165, @Jake-Egan wrote:

In D113049#3140160, @jsji wrote:

Can we use UNSUPPORTED instead of XFAIL since it is unsupported?

If 64-bit XCOFF object files will be supported in the future, I think it makes more sense to use XFAIL because these tests will still be run and pass after implementation.

We should remove the UNSUPPORTED when we enable the 64-bit XCOFF object file support . It is a waste of machine time to run them *NOW*, especially considering the number of these failing tests.

[jsji]

In D113049#3140174, @lkail wrote:

Is there any way to filter these tests out on AIX in lit.local.cfg?

Agree, I would prefer we do something similar to https://reviews.llvm.org/rG666accf283311c5110ae4e2e5e4c4b99078eed15#change-NFfZJdfkKBjR to exclude the unsupported files for now.

[Jake-Egan]

Thanks for the review. I updated the patch to use lit.cfg.py to filter tests that use obj options. For tests that don't use the option or has an individual folder, I changed them to UNSUPPORTED instead of XFAIL.

[jsji]

Thanks, looks much better now.

clang/test/ClangScanDeps/modules-full-by-mod-name.cpp

2

there is no fmodule-format=obj here, why are we failing here?

clang/test/lit.cfg.py

259

Why not adding ASTMerge and its subfolders?

[Jake-Egan]

clang/test/ClangScanDeps/modules-full-by-mod-name.cpp

2

They have the same error as the other tests:

64-bit XCOFF object files are not supported yet.

clang/test/lit.cfg.py

259

Adding those folders were causing regressions:

Clang :: utils/update_cc_test_checks/global-hex-value-regex.test
Clang :: utils/update_cc_test_checks/global-value-regex.test

With error:

did not discover any tests for provided path(s)

I think because the only test in the folder gets excluded, so LIT can't find any test to run.

I could create a lit.local.cfg in each ASTMerge subfolder to unsupport each one if that's preferred.

[Jake-Egan]

Removed some tests already disabled by D114481.

[Jake-Egan]

Ping.

[Jake-Egan]

Ping.

[shchenz]

clang/test/ClangScanDeps/modules-full-by-mod-name.cpp

2

Which RUN line causes the 64-bit XCOFF object files are not supported yet assertion? NO -emit-obj or fmodule-format=obj found in all the RUN lines.

clang/test/lit.cfg.py

253

Can we add -fintegrated-as here too?

[Jake-Egan]

Added -fintegrated-as option.

[Jake-Egan]

clang/test/ClangScanDeps/modules-full-by-mod-name.cpp

2

// RUN: clang-scan-deps -compilation-database %t.cdb -j 4 -format experimental-full \
// RUN:   -mode preprocess-minimized-sources -module-name=header1 >> %t.result

It fails here. t.result contains a module using the -fmodule-format=obj option.

[shchenz]

clang/test/ASTMerge/anonymous-fields/test.cpp

2

Do we still need this? -emit-obj is already excluded?

clang/test/ASTMerge/codegen-body/test.c

2

Do we still need this? -emit-obj is already excluded?

clang/test/ASTMerge/injected-class-name-decl/test.cpp

2

Do we still need this? -emit-obj is already excluded?

clang/test/ClangScanDeps/modules-full-by-mod-name.cpp

17

typos?

[Jake-Egan]

Fixed typo.

[Jake-Egan]

clang/test/ASTMerge/codegen-body/test.c

2

Excluding this test causes regressions because LIT can't find any tests at /codegen-body directory:

Clang :: utils/update_cc_test_checks/global-hex-value-regex.test
Clang :: utils/update_cc_test_checks/global-value-regex.test

I figure it's easier to mark this test unsupported.

[shchenz]

Look almost good! Thanks for doing this.

clang/test/ASTMerge/codegen-body/test.c

2

Is it possible to add expected-no-diagnostics for any of the above two RUN lines? So we will have a test point and be able to exclude this case?

[Jake-Egan]

clang/test/ASTMerge/codegen-body/test.c

2

Unfortunately adding expected-no-diagnostics fix the issue. The existing expected-no-diagnostics is already applied to all the RUN lines.

[Jake-Egan]

clang/test/ASTMerge/codegen-body/test.c

2

fix the issue

I meant *doesn't* fix the issue.

[shchenz]

LGTM. Thanks for the explanation.

clang/test/ASTMerge/anonymous-fields/test.cpp

+// UNSUPPORTED: powerpc64-ibm-aix
 // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/anonymous-fields1.cpp
 // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/anonymous-fields2.cpp
 // RUN: %clang_cc1 -emit-obj -o /dev/null -ast-merge %t.1.ast -ast-merge %t.2.ast %s
 // expected-no-diagnostics

clang/test/ASTMerge/codegen-body/test.c

+// UNSUPPORTED: powerpc64-ibm-aix
 // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/body1.c
 // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/body2.c
 // RUN: %clang_cc1 -emit-obj -o /dev/null -ast-merge %t.1.ast -ast-merge %t.2.ast %s
 // expected-no-diagnostics
-

clang/test/ASTMerge/injected-class-name-decl/test.cpp

+// UNSUPPORTED: powerpc64-ibm-aix
 // RUN: %clang_cc1 -std=c++1z -emit-pch -o %t.ast %S/Inputs/inject1.cpp
 // RUN: %clang_cc1 -std=c++1z -emit-obj -o /dev/null -ast-merge %t.ast %S/Inputs/inject2.cpp
 // expected-no-diagnostics

clang/test/ClangScanDeps/modules-full-by-mod-name.cpp

+// UNSUPPORTED: powerpc64-ibm-aix
 // RUN: rm -rf %t.dir
 // RUN: rm -rf %t.cdb
 // RUN: mkdir -p %t.dir
 // RUN: cp %s %t.dir/modules_cdb_input.cpp
 // RUN: cp %s %t.dir/modules_cdb_input2.cpp
 // RUN: mkdir %t.dir/Inputs
 // RUN: cp %S/Inputs/header.h %t.dir/Inputs/header.h
 // RUN: cp %S/Inputs/header2.h %t.dir/Inputs/header2.h
 // RUN: cp %S/Inputs/module.modulemap %t.dir/Inputs/module.modulemap
 // RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/modules_cdb_by_mod_name.json > %t.cdb
 // RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/modules_cdb_clangcl_by_mod_name.json > %t_clangcl.cdb
 //
 // RUN: echo %t.dir > %t.result
 // RUN: clang-scan-deps -compilation-database %t.cdb -j 4 -format experimental-full \
 // RUN:   -mode preprocess-minimized-sources -module-name=header1 >> %t.result
 // RUN: cat %t.result | sed 's:\\\\\?:/:g' | FileCheck --check-prefixes=CHECK %s
 //
 // RUN: echo %t.dir > %t_clangcl.result
 // RUN: clang-scan-deps -compilation-database %t_clangcl.cdb -j 4 -format experimental-full \
 // RUN:   -mode preprocess-minimized-sources -module-name=header1 >> %t_clangcl.result
 // RUN: cat %t_clangcl.result | sed 's:\\\\\?:/:g' | FileCheck --check-prefixes=CHECK %s
 
 // CHECK: [[PREFIX:.*]]
 // CHECK-NEXT: {

clang/test/ClangScanDeps/resource_directory.c

+// UNSUPPORTED: powerpc64-ibm-aix
 // REQUIRES: shell
 
 // RUN: rm -rf %t && mkdir %t
 // RUN: cp %S/Inputs/resource_directory/* %t
 
 // Deduce the resource directory from the compiler path.
 //
 // RUN: sed -e "s|CLANG|/our/custom/bin/clang|g" -e "s|DIR|%/t|g" \

clang/test/Driver/as-version.s

 // Test version information.
 
-// UNSUPPORTED: -zos
+// UNSUPPORTED: -zos, powerpc64-ibm-aix
 // RUN: %clang -Wa,--version -c -fintegrated-as %s -o /dev/null \
 // RUN:   | FileCheck --check-prefix=IAS %s
 // IAS: clang version

clang/test/Driver/cc-print-proc-stat.c

+// UNSUPPORTED: powerpc64-ibm-aix
 // RUN: env CC_PRINT_PROC_STAT=1 \
 // RUN:     CC_PRINT_PROC_STAT_FILE=%t.csv \
 // RUN: %clang -no-canonical-prefixes -S -o %t.s %s
 // RUN: FileCheck --check-prefix=CHECK-CSV %s < %t.csv
 // CHECK-CSV: clang{{.*}},"{{.*}}.s",{{[0-9]+}},{{[0-9]+}},{{[0-9]+}}
 
 // RUN: env CC_PRINT_PROC_STAT=1 \
 // RUN: %clang -no-canonical-prefixes -c -fintegrated-as %s -o %t.o | FileCheck %s
 // CHECK: clang{{.*}}: output={{.*}}.o, total={{[0-9.]+}} ms, user={{[0-9.]+}} ms, mem={{[0-9]+}} Kb

clang/test/Driver/compilation_database.c

+// UNSUPPORTED: powerpc64-ibm-aix
 // RUN: mkdir -p %t.workdir && cd %t.workdir
 // RUN: %clang -fintegrated-as -MD -MP --sysroot=somewhere -c -x c %s -xc++ %s -Wall -MJ - -no-canonical-prefixes 2>&1 | FileCheck %s
 // RUN: not %clang -c -x c %s -MJ %s/non-existant -no-canonical-prefixes 2>&1 | FileCheck --check-prefix=ERROR %s
 
 // CHECK: { "directory": "{{[^"]*}}workdir",  "file": "[[SRC:[^"]+[/|\\]compilation_database.c]]", "output": "compilation_database.o", "arguments": ["{{[^"]*}}clang{{[^"]*}}", "-xc", "[[SRC]]", "-fintegrated-as", "--sysroot=somewhere", "-c", "-Wall",{{.*}} "--target={{[^"]+}}"]},
 // CHECK: { "directory": "{{.*}}",  "file": "[[SRC:[^"]+[/|\\]compilation_database.c]]", "output": "compilation_database.o", "arguments": ["{{[^"]*}}clang{{[^"]*}}", "-xc++", "[[SRC]]", "-fintegrated-as", "--sysroot=somewhere", "-c", "-Wall",{{.*}} "--target={{[^"]+}}"]},
 // ERROR: error: compilation database '{{.*}}/non-existant' could not be opened:
 
 int main(void) {
   return 0;
 }

clang/test/Driver/modules-ts.cpp

+// UNSUPPORTED: powerpc64-ibm-aix
 // Check compiling a module interface to a .pcm file.
 //
 // RUN: %clang -fmodules-ts -x c++-module --precompile %s -o %t.pcm -v 2>&1 | FileCheck %s --check-prefix=CHECK-PRECOMPILE
 //
 // CHECK-PRECOMPILE: -cc1 {{.*}} -emit-module-interface
 // CHECK-PRECOMPILE-SAME: -o {{.*}}.pcm
 // CHECK-PRECOMPILE-SAME: -x c++
 // CHECK-PRECOMPILE-SAME: modules-ts.cpp

clang/test/Driver/report-stat.c

+// UNSUPPORTED: powerpc64-ibm-aix
 // RUN: %clang -c -fproc-stat-report -fintegrated-as %s | FileCheck %s
 // CHECK: clang{{.*}}: output={{.*}}.o, total={{[0-9.]+}} ms, user={{[0-9.]+}} ms, mem={{[0-9]+}} Kb
 
 // RUN: %clang -c -fintegrated-as -fproc-stat-report=%t %s
 // RUN: cat %t | FileCheck --check-prefix=CSV %s
 // CSV: clang{{.*}},"{{.*}}.o",{{[0-9]+}},{{[0-9]+}},{{[0-9]+}}

clang/test/lit.cfg.py

if os.path.exists('/etc/gentoo-release'):
     config.available_features.add('gentoo')
 
 if config.enable_shared:
     config.available_features.add("enable_shared")
 
 # Add a vendor-specific feature.
 if config.clang_vendor_uti:
     config.available_features.add('clang-vendor=' + config.clang_vendor_uti)
+
+def exclude_unsupported_files_for_aix(dirname):
+    for filename in os.listdir(dirname):
+        source_path = os.path.join( dirname, filename)
+        if os.path.isdir(source_path):
+            continue
+        f = open(source_path, 'r', encoding='ISO-8859-1')
+        try:
+           data = f.read()
+           # 64-bit object files are not supported on AIX, so exclude the tests.
+           if ('-emit-obj' in data or '-fmodule-format=obj' in data) and '64' in config.target_triple:
+               config.excludes += [ filename ]
+        finally:
+           f.close()
+
+if 'aix' in config.target_triple:
+    for directory in ('/CodeGenCXX', '/Misc', '/Modules', '/PCH'):
+        exclude_unsupported_files_for_aix(config.test_source_root + directory)
+

llvm/test/LTO/X86/remangle_intrinsics.ll

+; UNSUPPORTED: powerpc64-ibm-aix
 ; RUN: llvm-as < %s > %t1
 ; RUN: llvm-as < %p/Inputs/remangle_intrinsics.ll > %t2
 ; RUN: llvm-lto %t1 %t2 | FileCheck %s
 ; REQUIRES: default_triple
 
 ; We have "struct.rtx_def" type in both modules being LTOed. Both modules use
 ; an overloaded intrinsic which has this type in its signature/name. When
 ; modules are loaded one of the types is renamed to "struct.rtx_def.0".

llvm/test/lit.cfg.py

 if config.have_opt_viewer_modules:
     config.available_features.add('have_opt_viewer_modules')
 
 if config.expensive_checks:
     config.available_features.add('expensive_checks')
 
 if "MemoryWithOrigins" in config.llvm_use_sanitizer:
     config.available_features.add('use_msan_with_origins')
+
+def exclude_unsupported_files_for_aix(dirname):
+   for filename in os.listdir(dirname):
+       source_path = os.path.join( dirname, filename)
+       if os.path.isdir(source_path):
+           continue
+       f = open(source_path, 'r')
+       try:
+          data = f.read()
+          # 64-bit object files are not supported on AIX, so exclude the tests.
+          if ('-emit-obj' in data or '-filetype=obj' in data) and '64' in config.target_triple:
+            config.excludes += [ filename ]
+       finally:
+          f.close()
+
+if 'aix' in config.target_triple:
+    for directory in ('/CodeGen/X86', '/DebugInfo', '/DebugInfo/X86', '/DebugInfo/Generic', '/LTO/X86', '/Linker'):
+        exclude_unsupported_files_for_aix(config.test_source_root + directory)
+

llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp

#endif
   Optional<DWARFFormValue> Form3 = DieDG.find(Attr3);
   ASSERT_TRUE((bool)Form3);
   EXPECT_EQ(1u, Form3->getRawUValue());
   auto Extracted3 = toString(Form3);
   ASSERT_TRUE((bool)Extracted3);
   EXPECT_STREQ(String1, *Extracted3);
 }
 
+#if defined(_AIX) && defined(__64BIT__)
+TEST(DWARFDebugInfo, DISABLED_TestEmptyStringOffsets) {
+#else
 TEST(DWARFDebugInfo, TestEmptyStringOffsets) {
+#endif
   Triple Triple = getNormalizedDefaultTargetTriple();
   if (!isObjectEmissionSupported(Triple))
     return;
 
   const char *String1 = "Hello";
 
   auto ExpectedDG = dwarfgen::Generator::create(Triple, 5);
   ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
#endif
   MemoryBufferRef FileBuffer(FileBytes, "dwarf");
   auto Obj = object::ObjectFile::createObjectFile(FileBuffer);
   ASSERT_TRUE((bool)Obj);
   std::unique_ptr<DWARFContext> DwarfContext = DWARFContext::create(**Obj);
   EXPECT_TRUE(
       DwarfContext->getDWARFObj().getStrOffsetsSection().Data.empty());
 }
 
+#if defined(_AIX) && defined(__64BIT__)
+TEST(DWARFDebugInfo, DISABLED_TestRelations) {
+#else
 TEST(DWARFDebugInfo, TestRelations) {
+#endif
   Triple Triple = getNormalizedDefaultTargetTriple();
   if (!isObjectEmissionSupported(Triple))
     return;
 
   // Test the DWARF APIs related to accessing the DW_AT_low_pc and
   // DW_AT_high_pc.
   uint16_t Version = 4;
   auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
TEST(DWARFDebugInfo, TestDWARFDie) {
   // Make sure a default constructed DWARFDie doesn't have any parent, sibling
   // or child;
   DWARFDie DefaultDie;
   EXPECT_FALSE(DefaultDie.getParent().isValid());
   EXPECT_FALSE(DefaultDie.getFirstChild().isValid());
   EXPECT_FALSE(DefaultDie.getSibling().isValid());
 }
 
+#if defined(_AIX) && defined(__64BIT__)
+TEST(DWARFDebugInfo, DISABLED_TestChildIterators) {
+#else
 TEST(DWARFDebugInfo, TestChildIterators) {
+#endif
   Triple Triple = getNormalizedDefaultTargetTriple();
   if (!isObjectEmissionSupported(Triple))
     return;
 
   // Test the DWARF APIs related to iterating across the children of a DIE using
   // the DWARFDie::iterator class.
   uint16_t Version = 4;
   auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
TEST(DWARFDebugInfo, TestEmptyChildren) {
   EXPECT_TRUE(CUDie.isValid());
 
   // Verify that the CU Die that says it has children, but doesn't, actually
   // has begin and end iterators that are equal. We want to make sure we don't
   // see the Null DIEs during iteration.
   EXPECT_EQ(CUDie.begin(), CUDie.end());
 }
 
+#if defined(_AIX) && defined(__64BIT__)
+TEST(DWARFDebugInfo, DISABLED_TestAttributeIterators) {
+#else
 TEST(DWARFDebugInfo, TestAttributeIterators) {
+#endif
   Triple Triple = getNormalizedDefaultTargetTriple();
   if (!isObjectEmissionSupported(Triple))
     return;
 
   // Test the DWARF APIs related to iterating across all attribute values in a
   // a DWARFDie.
   uint16_t Version = 4;
   auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
#endif
 
   ASSERT_NE(E, ++I);
   EXPECT_EQ(I->Attr, DW_AT_low_pc);
   EXPECT_EQ(CULowPC, *I->Value.getAsAddress());
 
   EXPECT_EQ(E, ++I);
 }
 
+#if defined(_AIX) && defined(__64BIT__)
+TEST(DWARFDebugInfo, DISABLED_TestFindRecurse) {
+#else
 TEST(DWARFDebugInfo, TestFindRecurse) {
+#endif
   Triple Triple = getNormalizedDefaultTargetTriple();
   if (!isObjectEmissionSupported(Triple))
     return;
 
   uint16_t Version = 4;
   auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
   ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
   dwarfgen::Generator *DG = ExpectedDG.get().get();
TEST(DWARFDebugInfo, TestDwarfToFunctions) {
   EXPECT_EQ(InvalidU64, toReference(FormValOpt6, InvalidU64));
   EXPECT_EQ(InvalidU64, toAddress(FormValOpt6, InvalidU64));
   EXPECT_EQ(InvalidU64, toSectionOffset(FormValOpt6, InvalidU64));
   EXPECT_EQ(InvalidS64, toSigned(FormValOpt6, InvalidU64));
 
   // Test
 }
 
+#if defined(_AIX) && defined(__64BIT__)
+TEST(DWARFDebugInfo, DISABLED_TestFindAttrs) {
+#else
 TEST(DWARFDebugInfo, TestFindAttrs) {
+#endif
   Triple Triple = getNormalizedDefaultTargetTriple();
   if (!isObjectEmissionSupported(Triple))
     return;
 
   // Test the DWARFDie::find() and DWARFDie::findRecursively() that take an
   // ArrayRef<dwarf::Attribute> value to make sure they work correctly.
   uint16_t Version = 4;
   auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
#endif
   // Make sure we can extract the name from the specification die when using
   // DWARFDie::findRecursively() since it should recurse through the
   // DW_AT_specification DIE.
   auto NameOpt = FuncDie.findRecursively(Attrs);
   EXPECT_TRUE(NameOpt.hasValue());
   EXPECT_EQ(DieMangled, toString(NameOpt, ""));
 }
 
+#if defined(_AIX) && defined(__64BIT__)
+TEST(DWARFDebugInfo, DISABLED_TestImplicitConstAbbrevs) {
+#else
 TEST(DWARFDebugInfo, TestImplicitConstAbbrevs) {
+#endif
   Triple Triple = getNormalizedDefaultTargetTriple();
   if (!isObjectEmissionSupported(Triple))
     return;
 
   uint16_t Version = 5;
   auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
   ASSERT_THAT_EXPECTED(ExpectedDG, Succeeded());
   dwarfgen::Generator *DG = ExpectedDG.get().get();