[Comgr][Merge] Two dependent changes to fix spirv test (llvm#1317)

Author: lamb-j

amd/comgr/test-lit/spirv-translator-cached.cl

@@ -1,8 +1,9 @@
 // REQUIRES: comgr-has-spirv
 // COM: Same as spirv-translator but with the cache
+// RUN: rm -fr %t.cache
 
 // COM: Generate a spirv-targeted LLVM IR file from an OpenCL kernel
-// RUN: clang -c -emit-llvm --target=spirv64 %s -o %t.bc
+// RUN: clang -c -emit-llvm --target=spirv64 %S/spirv-translator.cl -o %t.bc
 
 // COM: Translate LLVM IR to SPIRV format
 // RUN: amd-llvm-spirv --spirv-target-env=CL2.0 %t.bc -o %t.spv
@@ -13,5 +14,10 @@
 // RUN: COUNT=$(ls "%t.cache" | wc -l)
 // RUN: [ 2 -eq $COUNT ]
 
+// COM: Run again and check that the cache contents haven't changed
+// RUN: AMD_COMGR_CACHE_DIR=%t.cache spirv-translator %t.spv -o %t.translated.again.bc
+// RUN: COUNT=$(ls "%t.cache" | wc -l)
+// RUN: [ 2 -eq $COUNT ]
+
 // COM: Dissasemble LLVM IR bitcode to LLVM IR text
 // RUN: llvm-dis %t.translated.bc -o - | FileCheck %S/spirv-translator.cl