Skip to content

Fix mccas replay stable #7692

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
Nov 9, 2023
Merged

Fix mccas replay stable #7692

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
5 changes: 4 additions & 1 deletion clang/lib/Frontend/CompileJobCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,10 @@ std::optional<int> ObjectStoreCachingOutputs::replayCachedResult(
Expected<std::optional<int>> ObjectStoreCachingOutputs::replayCachedResult(
const llvm::cas::CASID &ResultCacheKey,
clang::cas::CompileJobCacheResult &Result, bool JustComputedResult) {
if (JustComputedResult)
// FIXME: The correct fix for MCCAS replay is that you have an official CASID
// file output going all the way down into ObjectWriter, we can remove this
// callback and special case.
if (JustComputedResult && !ComputedJobNeedsReplay)
return std::nullopt;

llvm::cas::ObjectStore &CAS = Result.getCAS();
Expand Down
31 changes: 31 additions & 0 deletions clang/test/CAS/mccas-replay-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// RUN: rm -rf %t && mkdir -p %t
// RUN: export LLVM_CACHE_CAS_PATH=%t/cas && %clang-cache \
// RUN: %clang -target arm64-apple-macosx12.0.0 -c -Xclang -fcas-backend -Rcompile-job-cache %s -o %t/tmp.o -g 2>&1 | FileCheck %s -check-prefix=CACHE-MISS
// CACHE-MISS: remark: compile job cache miss

// RUN: llvm-objdump -h %t/tmp.o | FileCheck %s -check-prefix=CHECK-OBJDUMP

// RUN: export LLVM_CACHE_CAS_PATH=%t/cas && %clang-cache \
// RUN: %clang -target arm64-apple-macosx12.0.0 -c -Xclang -fcas-backend -Rcompile-job-cache %s -o %t/tmp.o -g 2>&1 | FileCheck %s -check-prefix=CACHE-HIT
// CACHE-HIT: remark: compile job cache hit

// RUN: llvm-objdump -h %t/tmp.o 2>&1 | FileCheck %s -check-prefix=CHECK-OBJDUMP

// CHECK-OBJDUMP: Sections:
// CHECK-OBJDUMP-NEXT: Idx Name Size VMA Type
// CHECK-OBJDUMP-NEXT: 0 __text {{[0-9a-f]+}} {{[0-9a-f]+}} TEXT
// CHECK-OBJDUMP-NEXT: 1 __debug_abbrev {{[0-9a-f]+}} {{[0-9a-f]+}} DATA, DEBUG
// CHECK-OBJDUMP-NEXT: 2 __debug_info {{[0-9a-f]+}} {{[0-9a-f]+}} DATA, DEBUG
// CHECK-OBJDUMP-NEXT: 3 __debug_str {{[0-9a-f]+}} {{[0-9a-f]+}} DATA, DEBUG
// CHECK-OBJDUMP-NEXT: 4 __apple_names {{[0-9a-f]+}} {{[0-9a-f]+}} DATA, DEBUG
// CHECK-OBJDUMP-NEXT: 5 __apple_objc {{[0-9a-f]+}} {{[0-9a-f]+}} DATA, DEBUG
// CHECK-OBJDUMP-NEXT: 6 __apple_namespac {{[0-9a-f]+}} {{[0-9a-f]+}} DATA, DEBUG
// CHECK-OBJDUMP-NEXT: 7 __apple_types {{[0-9a-f]+}} {{[0-9a-f]+}} DATA, DEBUG
// CHECK-OBJDUMP-NEXT: 8 __compact_unwind {{[0-9a-f]+}} {{[0-9a-f]+}} DATA
// CHECK-OBJDUMP-NEXT: 9 __debug_line {{[0-9a-f]+}} {{[0-9a-f]+}} DATA, DEBUG

// REQUIRES: aarch64-registered-target

int foo() {
return 1;
}