This is an archive of the discontinued LLVM Phabricator instance.

Differential D118152

[clang][deps] Adapt test to be compatible when the assembler is called by default
ClosedPublic

Authored by Jake-Egan on Jan 25 2022, 8:15 AM.

Details

Reviewers
stevewan
jansvoboda11
Commits
rG6f4f745668ec: [clang][deps] Adapt test to be compatible when the assembler is called by…
Summary

When -fno-integrated-as is in effect (the default on AIX) the cc1 job produces a .s file instead. This patch adapts the test to accept .s or .o files.

Diff Detail

Event Timeline

Jake-Egan requested review of this revision.Jan 25 2022, 8:15 AM
Jake-Egan created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 25 2022, 8:15 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Jake-Egan edited the summary of this revision. (Show Details)Jan 25 2022, 8:18 AM
Jake-Egan added reviewers: stevewan, jansvoboda11.
jansvoboda11 added inline comments.Jan 25 2022, 8:44 AM
clang/test/ClangScanDeps/headerwithdirname.cpp
16

Why is {{.*}} necessary?

Jake-Egan added inline comments.Jan 25 2022, 9:57 AM
clang/test/ClangScanDeps/headerwithdirname.cpp
16

It's to match the random characters between "input" and the file extension. The output on AIX looks like this:
/tmp/headerwithdirname_input-ffd608.s: \

Harbormaster completed remote builds in B145520: Diff 402920.Jan 26 2022, 4:11 PM
stevewan added inline comments.Jan 27 2022, 11:49 AM
clang/test/ClangScanDeps/headerwithdirname.cpp
16

To be clear, this isn't AIX specific behaviour. We get the temp assembly file when -fno-integrated-as is on.

Maybe slightly more accurate is,

// CHECK: headerwithdirname_input{{\.o|.*\.s}}
Jake-Egan updated this revision to Diff 403761.Jan 27 2022, 12:46 PM

Updated patch to use a more accurate check.

Harbormaster completed remote builds in B146108: Diff 403761.Jan 27 2022, 12:47 PM
Jake-Egan updated this revision to Diff 403763.Jan 27 2022, 12:52 PM

Fixed diff.

Jake-Egan marked an inline comment as done.Jan 27 2022, 12:53 PM
Harbormaster completed remote builds in B146110: Diff 403763.Jan 27 2022, 2:04 PM
jansvoboda11 accepted this revision.Jan 28 2022, 12:09 AM

Thanks for the explanation and update. LGTM.

This revision is now accepted and ready to land.Jan 28 2022, 12:09 AM
This revision was landed with ongoing or failed builds.Jan 28 2022, 8:40 AM
Closed by commit rG6f4f745668ec: [clang][deps] Adapt test to be compatible when the assembler is called by… (authored by Jake-Egan). · Explain Why
This revision was automatically updated to reflect the committed changes.
Jake-Egan added a commit: rG6f4f745668ec: [clang][deps] Adapt test to be compatible when the assembler is called by….

Revision Contents

PathSize
clang/
test/
ClangScanDeps/
2 lines
2 lines

Diff 404044

clang/test/ClangScanDeps/headerwithdirname.cpp

// RUN: rm -rf %t.dir // RUN: rm -rf %t.dir
// RUN: rm -rf %t.dir/foodir // RUN: rm -rf %t.dir/foodir
// RUN: rm -rf %t.cdb // RUN: rm -rf %t.cdb
// RUN: mkdir -p %t.dir // RUN: mkdir -p %t.dir
// RUN: mkdir -p %t.dir/foodir // RUN: mkdir -p %t.dir/foodir
// RUN: cp %s %t.dir/headerwithdirname_input.cpp // RUN: cp %s %t.dir/headerwithdirname_input.cpp
// RUN: cp %s %t.dir/headerwithdirname_input_clangcl.cpp // RUN: cp %s %t.dir/headerwithdirname_input_clangcl.cpp
// RUN: mkdir %t.dir/Inputs // RUN: mkdir %t.dir/Inputs
// RUN: cp %S/Inputs/foodir %t.dir/Inputs/foodir // RUN: cp %S/Inputs/foodir %t.dir/Inputs/foodir
// RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/headerwithdirname.json > %t.cdb // RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/headerwithdirname.json > %t.cdb
// //
// RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s // RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s
#include <foodir> #include <foodir>
// CHECK: headerwithdirname_input.o // CHECK: headerwithdirname_input{{\.o|.*\.s}}
jansvoboda11Unsubmitted
Not Done
ReplyInline Actions

Why is {{.*}} necessary?

jansvoboda11: Why is `{{.*}}` necessary?
Jake-EganAuthorUnsubmitted
Done
ReplyInline Actions

It's to match the random characters between "input" and the file extension. The output on AIX looks like this:
/tmp/headerwithdirname_input-ffd608.s: \

Jake-Egan: It's to match the random characters between "input" and the file extension. The output on AIX…
stevewanUnsubmitted
Done
ReplyInline Actions

To be clear, this isn't AIX specific behaviour. We get the temp assembly file when -fno-integrated-as is on.

Maybe slightly more accurate is,

// CHECK: headerwithdirname_input{{\.o|.*\.s}}
stevewan: To be clear, this isn't AIX specific behaviour. We get the temp assembly file when `-fno…
// CHECK-NEXT: headerwithdirname_input.cpp // CHECK-NEXT: headerwithdirname_input.cpp
// CHECK-NEXT: Inputs{{/|\\}}foodir // CHECK-NEXT: Inputs{{/|\\}}foodir
// CHECK: headerwithdirname_input_clangcl.o // CHECK: headerwithdirname_input_clangcl.o
// CHECK-NEXT: headerwithdirname_input_clangcl.cpp // CHECK-NEXT: headerwithdirname_input_clangcl.cpp
// CHECK-NEXT: Inputs{{/|\\}}foodir // CHECK-NEXT: Inputs{{/|\\}}foodir

clang/test/ClangScanDeps/headerwithdirnamefollowedbyinclude.cpp

Show All 11 Lines
// RUN: cp %S/Inputs/foodir %t.dir/Inputs/foodir // RUN: cp %S/Inputs/foodir %t.dir/Inputs/foodir
// RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/headerwithdirnamefollowedbyinclude.json > %t.cdb // RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/headerwithdirnamefollowedbyinclude.json > %t.cdb
// //
// RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s // RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s
#include <foodir> #include <foodir>
#include "foodir/foodirheader.h" #include "foodir/foodirheader.h"
// CHECK: headerwithdirname_input.o // CHECK: headerwithdirname_input{{\.o|.*\.s}}
// CHECK-NEXT: headerwithdirname_input.cpp // CHECK-NEXT: headerwithdirname_input.cpp
// CHECK-NEXT: Inputs{{/|\\}}foodir // CHECK-NEXT: Inputs{{/|\\}}foodir
// CHECK: headerwithdirname_input_clangcl.o // CHECK: headerwithdirname_input_clangcl.o
// CHECK-NEXT: headerwithdirname_input_clangcl.cpp // CHECK-NEXT: headerwithdirname_input_clangcl.cpp
// CHECK-NEXT: Inputs{{/|\\}}foodir // CHECK-NEXT: Inputs{{/|\\}}foodir