Skip to content

[Driver][SYCL] Properly tag temporary list file for archive unbundling #6470

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
bader merged 3 commits into from
Jul 26, 2022
Merged

[Driver][SYCL] Properly tag temporary list file for archive unbundling #6470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17ffa45
[Driver][SYCL] Properly tag temporary list file for archive unbundling
mdtoguchi Jul 23, 2022
e3bea47
Make sure other locations in which we add a list temp are marked
mdtoguchi Jul 25, 2022
3f3834d
Clang format
mdtoguchi Jul 25, 2022
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
8 changes: 4 additions & 4 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7788,8 +7788,8 @@ InputInfoList Driver::BuildJobsForActionNoCache(
std::string TmpFileName = C.getDriver().GetTemporaryPath(
llvm::sys::path::stem(BaseInput),
JA->getType() == types::TY_Archive ? "a" : "txt");
const char *TmpFile =
C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
const char *TmpFile = C.addTempFile(
C.getArgs().MakeArgString(TmpFileName), JA->getType());
CurI = InputInfo(JA->getType(), TmpFile, TmpFile);
} else if (types::isFPGA(JA->getType())) {
std::string Ext(types::getTypeTempSuffix(JA->getType()));
Expand Down Expand Up @@ -7823,7 +7823,7 @@ InputInfoList Driver::BuildJobsForActionNoCache(
std::string TmpFileName = C.getDriver().GetTemporaryPath(
llvm::sys::path::stem(BaseInput), Ext);
const char *TmpFile =
C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
C.addTempFile(C.getArgs().MakeArgString(TmpFileName), TI);
CurI = InputInfo(TI, TmpFile, TmpFile);
} else {
// Host part of the unbundled object is not used when -fsycl-link is
Expand Down Expand Up @@ -7880,7 +7880,7 @@ InputInfoList Driver::BuildJobsForActionNoCache(
std::string TmpFileName =
C.getDriver().GetTemporaryPath(llvm::sys::path::stem(BaseInput), Ext);
const char *TmpFile =
C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
C.addTempFile(C.getArgs().MakeArgString(TmpFileName), JA->getType());
Result = InputInfo(JA->getType(), TmpFile, TmpFile);
UnbundlingResults.push_back(Result);
} else {
Expand Down
3 changes: 2 additions & 1 deletion clang/test/Driver/sycl-offload-tempfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

// RUN: mkdir -p %t_dir
// RUN: env TMPDIR=%t_dir TEMP=%t_dir TMP=%t_dir \
// RUN: %clang -### -fsycl -fsycl-device-code-split %s 2>&1 | \
// RUN: %clang -### -target x86_64-unknown-linux-gnu %S/Inputs/SYCL/liblin64.a \
// RUN: -fsycl -fsycl-device-code-split %s 2>&1 | \
// RUN: FileCheck -DDIRNAME=%t_dir --check-prefix=CHECK-TEMPFILE-SPLIT %s
// RUN: not ls %t_dir/*
// CHECK-TEMPFILE-SPLIT: sycl-post-link{{.*}} "-o" "[[DIRNAME]]{{\/|\\}}[[TABLE:.+\.table]]"
Expand Down