Skip to content

Enable MCCAS by default in clang-cache #8548

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
Apr 17, 2024
Merged

Enable MCCAS by default in clang-cache #8548

Show file tree
Hide file tree
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
34 changes: 34 additions & 0 deletions clang/test/CAS/driver-cache-launcher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,40 @@
// PLUGIN: "-fcas-plugin-option" "some-opt=value"
// PLUGIN: "-fcas-plugin-option" "opt2=val2"

// RUN: env LLVM_CACHE_CAS_PATH=%t/cas \
// RUN: %clang-cache %clang -c %s -o %t.o -### 2>&1 | FileCheck %s -check-prefix=ENABLE-MCCAS -DPREFIX=%t
// ENABLE-MCCAS: "-fcas-path" "[[PREFIX]]/cas"
// ENABLE-MCCAS: "-fcas-backend"
// ENABLE-MCCAS: "-mllvm"
// ENABLE-MCCAS: "-cas-friendly-debug-info"

// RUN: env LLVM_CACHE_CAS_PATH=%t/cas CLANG_CACHE_VERIFY_MCCAS=1 \
// RUN: %clang-cache %clang -c %s -o %t.o -### 2>&1 | FileCheck %s -check-prefix=ENABLE-MCCAS-VERIFY -DPREFIX=%t
// ENABLE-MCCAS-VERIFY: "-fcas-path" "[[PREFIX]]/cas"
// ENABLE-MCCAS-VERIFY: "-fcas-backend"
// ENABLE-MCCAS-VERIFY: "-fcas-backend-mode=verify"
// ENABLE-MCCAS-VERIFY: "-mllvm"
// ENABLE-MCCAS-VERIFY: "-cas-friendly-debug-info"

// RUN: env LLVM_CACHE_CAS_PATH=%t/cas CLANG_CACHE_DISABLE_MCCAS=1 \
// RUN: %clang-cache %clang -c %s -o %t.o -### 2>&1 | FileCheck %s -check-prefix=DISABLE-MCCAS -DPREFIX=%t

// RUN: env LLVM_CACHE_CAS_PATH=%t/cas LLVM_CACHE_REMOTE_SERVICE_SOCKET_PATH=%t/ccremote \
// RUN: %clang-cache %clang -c %s -o %t.o -### 2>&1 | FileCheck %s -check-prefix=DISABLE-MCCAS -DPREFIX=%t

// RUN: env LLVM_CACHE_CAS_PATH=%t/cas LLVM_CACHE_REMOTE_SERVICE_SOCKET_PATH=%t/ccremote CLANG_CACHE_DISABLE_MCCAS=1 \
// RUN: %clang-cache %clang -c %s -o %t.o -### 2>&1 | FileCheck %s -check-prefix=DISABLE-MCCAS -DPREFIX=%t

// RUN: env LLVM_CACHE_CAS_PATH=%t/cas LLVM_CACHE_REMOTE_SERVICE_SOCKET_PATH=%t/ccremote CLANG_CACHE_DISABLE_MCCAS=1 CLANG_CACHE_VERIFY_MCCAS=1 \
// RUN: %clang-cache %clang -c %s -o %t.o -### 2>&1 | FileCheck %s -check-prefix=DISABLE-MCCAS -DPREFIX=%t

// DISABLE-MCCAS-NOT: "-fcas-backend"
// DISABLE-MCCAS-NOT: "-fcas-backend-mode=verify"
// DISABLE-MCCAS-NOT: "-mllvm"
// DISABLE-MCCAS-NOT: "-cas-friendly-debug-info"



// RUN: env LLVM_CACHE_CAS_PATH=%t/cas LLVM_CACHE_REMOTE_SERVICE_SOCKET_PATH=%t/ccremote %clang-cache %clang -c %s -o %t.o -### 2>&1 | FileCheck %s -check-prefix=REMOTE -DPREFIX=%t
// REMOTE: "-fcompilation-caching-service-path" "[[PREFIX]]/ccremote"

Expand Down
19 changes: 17 additions & 2 deletions clang/tools/driver/CacheLauncherMode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ static void addCommonArgs(bool ForDriver, SmallVectorImpl<const char *> &Args,
/// Arguments specific to \p clang-cache compiler launcher functionality.
static void addLauncherArgs(SmallVectorImpl<const char *> &Args,
llvm::StringSaver &Saver) {

if (const char *DaemonPath =
::getenv("CLANG_CACHE_SCAN_DAEMON_SOCKET_PATH")) {
// Instruct clang to connect to scanning daemon that is listening on the
Expand Down Expand Up @@ -162,12 +163,26 @@ static void addLauncherArgs(SmallVectorImpl<const char *> &Args,
Args.push_back(Saver.save("-fdepscan-prefix-map=" + PrefixMap).data());
}
}
if (const char *ServicePath =
::getenv("LLVM_CACHE_REMOTE_SERVICE_SOCKET_PATH")) {

const char *ServicePath = ::getenv("LLVM_CACHE_REMOTE_SERVICE_SOCKET_PATH");

if (ServicePath) {
Args.append({"-Xclang", "-fcompilation-caching-service-path", "-Xclang",
ServicePath});
}
Args.append({"-greproducible"});

if (!llvm::sys::Process::GetEnv("CLANG_CACHE_DISABLE_MCCAS") &&
!ServicePath) {
Args.push_back("-Xclang");
Args.push_back("-fcas-backend");
if (llvm::sys::Process::GetEnv("CLANG_CACHE_VERIFY_MCCAS")) {
Args.push_back("-Xclang");
Args.push_back("-fcas-backend-mode=verify");
}
Args.push_back("-mllvm");
Args.push_back("-cas-friendly-debug-info");
}
}

static void addScanServerArgs(const char *SocketPath,
Expand Down