Skip to content

Commit d86ee2f

Browse files
authored
[SYCL][Driver][NFC] Cleanup temporary files when split is enabled (#1078)
Driver removed file list file but didn't clean up files from this list because it does so only if type of file is specified as temporary file list. Signed-off-by: Mariya Podchishchaeva <[email protected]>
1 parent 50e7abd commit d86ee2f

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7119,8 +7119,8 @@ void OffloadWrapper::ConstructJob(Compilation &C, const JobAction &JA,
71197119
if (!ForeachArgs.empty()) {
71207120
std::string ForeachOutName =
71217121
C.getDriver().GetTemporaryPath("wrapper-linker", "txt");
7122-
const char *ForeachOutput =
7123-
C.addTempFile(C.getArgs().MakeArgString(ForeachOutName));
7122+
const char *ForeachOutput = C.addTempFile(
7123+
C.getArgs().MakeArgString(ForeachOutName), types::TY_Tempfilelist);
71247124
SmallString<128> OutOpt("--out-file-list=");
71257125
OutOpt += ForeachOutput;
71267126

clang/test/Driver/sycl-offload-tempfile.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,11 @@
1010
// RUN: not ls %t_dir/*
1111
// CHECK-TEMPFILE: clang-offload-bundler{{.*}} "-type=oo" "-targets=host-x86_64-unknown-linux-gnu,sycl-spir64-unknown-unknown-sycldevice" "-inputs=[[DIRNAME]]{{.*}}" "-outputs={{.*}},[[DIRNAME]]{{\/|\\}}[[OUTPUT3:.+\.txt]]" "-unbundle"
1212
// CHECK-TEMPFILE: llvm-link{{.*}} "@[[DIRNAME]]{{\/|\\}}[[OUTPUT3]]"
13+
14+
// RUN: mkdir -p %t_dir
15+
// RUN: env TMPDIR=%t_dir TEMP=%t_dir TMP=%t_dir \
16+
// RUN: %clang -### -fsycl -fsycl-device-code-split %s 2>&1 | \
17+
// RUN: FileCheck -DDIRNAME=%t_dir --check-prefix=CHECK-TEMPFILE-SPLIT %s
18+
// RUN: not ls %t_dir/*
19+
// CHECK-TEMPFILE-SPLIT: llvm-foreach{{.*}} "--out-file-list=[[DIRNAME]]{{\/|\\}}[[OUTPUT:.+\.txt]]" {{.*}}clang-offload-wrapper{{.*}}
20+
// CHECK-TEMPFILE-SPLIT: llvm-link{{.*}} "@[[DIRNAME]]{{\/|\\}}[[OUTPUT]]"

0 commit comments

Comments
 (0)