From abd1579f8c72131965e64b3425fd3d3d4ea1b0f6 Mon Sep 17 00:00:00 2001 From: Steven Wu Date: Thu, 5 Oct 2023 10:32:33 -0700 Subject: [PATCH] [ClangScanDeps] Fix cas dependency scanning test after D159064 Add the new C standard library header dependency into cas module dependency scanning test. rdar://116522302 --- .../ClangScanDeps/modules-cas-fs-prefix-mapping-caching.c | 4 ++++ clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c | 8 +++++++- .../modules-pch-cas-fs-prefix-mapping-caching.c | 4 ++++ .../ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c | 8 +++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping-caching.c b/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping-caching.c index f4c88befd742f..2930303dd69a7 100644 --- a/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping-caching.c +++ b/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping-caching.c @@ -21,20 +21,24 @@ // RUN: > %t/dir2.txt // Extract individual commands. +// RUN: %deps-to-rsp %t/dir1.txt --module-name=_Builtin_stdarg > %t/dir1/stdarg.cc1.rsp // RUN: %deps-to-rsp %t/dir1.txt --module-name=B > %t/dir1/B.cc1.rsp // RUN: %deps-to-rsp %t/dir1.txt --module-name=A > %t/dir1/A.cc1.rsp // RUN: %deps-to-rsp %t/dir1.txt --tu-index 0 > %t/dir1/tu.cc1.rsp +// RUN: %deps-to-rsp %t/dir2.txt --module-name=_Builtin_stdarg > %t/dir2/stdarg.cc1.rsp // RUN: %deps-to-rsp %t/dir2.txt --module-name=B > %t/dir2/B.cc1.rsp // RUN: %deps-to-rsp %t/dir2.txt --module-name=A > %t/dir2/A.cc1.rsp // RUN: %deps-to-rsp %t/dir2.txt --tu-index 0 > %t/dir2/tu.cc1.rsp +// RUN: (cd %t/dir1; %clang @stdarg.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-MISS // RUN: (cd %t/dir1; %clang @B.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-MISS // RUN: (cd %t/dir1; %clang @A.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-MISS // RUN: (cd %t/dir1; %clang @tu.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-MISS // CACHE-MISS: compile job cache miss +// RUN: (cd %t/dir2; %clang @stdarg.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-HIT // RUN: (cd %t/dir2; %clang @B.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-HIT // RUN: (cd %t/dir2; %clang @A.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-HIT // RUN: (cd %t/dir2; %clang @tu.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-HIT diff --git a/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c b/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c index 50f99f4fa609a..9d04469028760 100644 --- a/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c +++ b/clang/test/ClangScanDeps/modules-cas-fs-prefix-mapping.c @@ -16,6 +16,7 @@ // RUN: FileCheck %s -input-file %t/full_result.txt -DPREFIX=%t -DSDK_PREFIX=%S/Inputs/SDK // Extract individual commands. +// RUN: %deps-to-rsp %t/full_result.txt --module-name=_Builtin_stdarg > %t/stdarg.cc1.rsp // RUN: %deps-to-rsp %t/full_result.txt --module-name=B > %t/B.cc1.rsp // RUN: %deps-to-rsp %t/full_result.txt --module-name=A > %t/A.cc1.rsp // RUN: %deps-to-rsp %t/full_result.txt --tu-index 0 > %t/tu.cc1.rsp @@ -41,6 +42,7 @@ // FS: file llvmcas://{{.*}} /^tc/lib/clang/{{.*}}/include/stdarg.h // Check that it builds. +// RUN: %clang @%t/stdarg.cc1.rsp // RUN: %clang @%t/B.cc1.rsp // RUN: %clang @%t/A.cc1.rsp // RUN: %clang @%t/tu.cc1.rsp @@ -89,7 +91,11 @@ // CHECK: } // CHECK: { // CHECK: "casfs-root-id": "[[B_ROOT_ID:llvmcas://[[:xdigit:]]+]]" -// CHECK: "clang-module-deps": [], +// CHECK: "clang-module-deps": [ +// CHECK: { +// CHECK: "module-name": "_Builtin_stdarg" +// CHECK: } +// CHECK: ], // CHECK: "clang-modulemap-file": "[[PREFIX]]/module.modulemap" // CHECK: "command-line": [ // CHECK: "-fcas-path" diff --git a/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping-caching.c b/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping-caching.c index 080bc88bf52f1..e434fbfc2d00d 100644 --- a/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping-caching.c +++ b/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping-caching.c @@ -22,18 +22,22 @@ // RUN: > %t/pch_dir2.txt // == Build PCH +// RUN: %deps-to-rsp %t/pch_dir1.txt --module-name=_Builtin_stdarg > %t/dir1/stdarg.cc1.rsp // RUN: %deps-to-rsp %t/pch_dir1.txt --module-name=B > %t/dir1/B.cc1.rsp // RUN: %deps-to-rsp %t/pch_dir1.txt --module-name=A > %t/dir1/A.cc1.rsp // RUN: %deps-to-rsp %t/pch_dir1.txt --tu-index 0 > %t/dir1/pch.cc1.rsp +// RUN: (cd %t/dir1; %clang @stdarg.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-MISS // RUN: (cd %t/dir1; %clang @B.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-MISS // RUN: (cd %t/dir1; %clang @A.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-MISS // RUN: (cd %t/dir1; %clang @pch.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-MISS // CACHE-MISS: compile job cache miss +// RUN: %deps-to-rsp %t/pch_dir2.txt --module-name=_Builtin_stdarg > %t/dir2/stdarg.cc1.rsp // RUN: %deps-to-rsp %t/pch_dir2.txt --module-name=B > %t/dir2/B.cc1.rsp // RUN: %deps-to-rsp %t/pch_dir2.txt --module-name=A > %t/dir2/A.cc1.rsp // RUN: %deps-to-rsp %t/pch_dir2.txt --tu-index 0 > %t/dir2/pch.cc1.rsp +// RUN: (cd %t/dir2; %clang @stdarg.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-HIT // RUN: (cd %t/dir2; %clang @B.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-HIT // RUN: (cd %t/dir2; %clang @A.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-HIT // RUN: (cd %t/dir2; %clang @pch.cc1.rsp) 2>&1 | FileCheck %s -check-prefix=CACHE-HIT diff --git a/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c b/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c index 4b0a436e8e217..dbd5869dde4fa 100644 --- a/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c +++ b/clang/test/ClangScanDeps/modules-pch-cas-fs-prefix-mapping.c @@ -18,9 +18,11 @@ // RUN: FileCheck %s -input-file %t/pch_result.txt -DPREFIX=%t -DSDK_PREFIX=%S/Inputs/SDK -check-prefix=PCH // == Build PCH +// RUN: %deps-to-rsp %t/pch_result.txt --module-name=_Builtin_stdarg > %t/stdarg.cc1.rsp // RUN: %deps-to-rsp %t/pch_result.txt --module-name=B > %t/B.cc1.rsp // RUN: %deps-to-rsp %t/pch_result.txt --module-name=A > %t/A.cc1.rsp // RUN: %deps-to-rsp %t/pch_result.txt --tu-index 0 > %t/pch.cc1.rsp +// RUN: %clang @%t/stdarg.cc1.rsp // RUN: %clang @%t/B.cc1.rsp // RUN: %clang @%t/A.cc1.rsp // Ensure we load pcms from action cache @@ -119,7 +121,11 @@ // PCH: } // PCH: { // PCH: "casfs-root-id": "[[B_ROOT_ID:llvmcas://[[:xdigit:]]+]]" -// PCH: "clang-module-deps": [], +// PCH: "clang-module-deps": [ +// PCH: { +// PCH: "module-name": "_Builtin_stdarg" +// PCH: } +// PCH: ], // PCH: "clang-modulemap-file": "[[PREFIX]]/module.modulemap" // PCH: "command-line": [ // PCH: "-fcas-path"