Skip to content

Revert "[Comgr][NFC] Refactor remove dir for windows" (#3141) #344

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
merged 1 commit into from
Oct 23, 2025
Merged

Revert "[Comgr][NFC] Refactor remove dir for windows" (#3141) #344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions amd/comgr/src/comgr-compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,16 +810,11 @@ amd_comgr_status_t AMDGPUCompiler::createTmpDirs() {
return AMD_COMGR_STATUS_SUCCESS;
}

amd_comgr_status_t AMDGPUCompiler::removeTmpDirs() {
if (TmpDir.empty()) {
return AMD_COMGR_STATUS_SUCCESS;
}
ProfilePoint Point("RemoveDir");

#ifdef _WIN32
// On windows fs::remove_directories takes huge time so use fs::remove.
#ifdef _WIN32
amd_comgr_status_t removeDirectory(const StringRef DirName) {
std::error_code EC;
for (fs::directory_iterator Dir(TmpDir, EC), DirEnd; Dir != DirEnd && !EC;
for (fs::directory_iterator Dir(DirName, EC), DirEnd; Dir != DirEnd && !EC;
Dir.increment(EC)) {
const StringRef Path = Dir->path();

Expand Down Expand Up @@ -849,16 +844,26 @@ amd_comgr_status_t AMDGPUCompiler::removeTmpDirs() {
}
}

if (fs::remove(TmpDir)) {
if (fs::remove(DirName)) {
return AMD_COMGR_STATUS_ERROR;
}

return AMD_COMGR_STATUS_SUCCESS;
#else
}
#endif

amd_comgr_status_t AMDGPUCompiler::removeTmpDirs() {
if (TmpDir.empty()) {
return AMD_COMGR_STATUS_SUCCESS;
}
ProfilePoint Point("RemoveDir");
#ifndef _WIN32
if (fs::remove_directories(TmpDir)) {
return AMD_COMGR_STATUS_ERROR;
}
return AMD_COMGR_STATUS_SUCCESS;
#else
return removeDirectory(TmpDir);
#endif
}

Expand Down