[Comgr] Add log entry for storing cache results

Comgr previously logged when a cache entry was found, but not when it
was stored. This PR adds a stored log message and puts the found/stored
distinction at the beginning of the message to make things more clear.  (llvm#3987)

Author: alsimmon

amd/comgr/src/comgr-cache.cpp

@@ -236,7 +236,7 @@ amd_comgr_status_t CommandCache::execute(CachedCommandAdaptor &C,
   AddStreamFn &AddStream = *AddStreamOrErr;
   if (!AddStream && readEntryFromCache(C, *CachedBuffer, LogS)) {
     if (env::shouldEmitVerboseLogs())
-      LogS << "Comgr cache: entry " << *MaybeId << " found in cache.\n";
+      LogS << "Comgr cache: found entry " << *MaybeId << " in cache.\n";
     return AMD_COMGR_STATUS_SUCCESS;
   }
 
@@ -247,6 +247,8 @@ amd_comgr_status_t CommandCache::execute(CachedCommandAdaptor &C,
   LogS << CapturedLogS;
 
   if (Result == AMD_COMGR_STATUS_SUCCESS && AddStream) {
+    if (env::shouldEmitVerboseLogs())
+      LogS << "Comgr cache: stored entry " << *MaybeId << " in cache.\n";
     saveCommandOutput(C, AddStream, CapturedLogS, LogS);
   }
 

amd/comgr/test-lit/cache-tests/compile-minimal-test-cached.cl

@@ -1,11 +1,20 @@
 // RUN: rm -fr %t.cache
 //
+// RUN: export AMD_COMGR_EMIT_VERBOSE_LOGS=1
+// RUN: export AMD_COMGR_REDIRECT_LOGS=stdout
+//
+//
+// COM: Check the default behavior of AMD_COMGR_CACHE
 // RUN: unset AMD_COMGR_CACHE
 // RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-opencl-minimal \
-// RUN:    %S/../compile-minimal-test.cl %t.bin 1.2
+// RUN:    %S/../compile-minimal-test.cl %t.bin 1.2 | FileCheck --check-prefix=STORED %s
 // RUN: llvm-objdump -d %t.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: [ -d %t.cache ]
 //
+// RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-opencl-minimal \
+// RUN:    %S/../compile-minimal-test.cl %t.bin 1.2 | FileCheck --check-prefix=FOUND %s
+// RUN: llvm-objdump -d %t.bin | FileCheck %S/../compile-minimal-test.cl
+//
 // RUN: rm -fr %t.cache
 //
 // RUN: export AMD_COMGR_CACHE=0
@@ -20,7 +29,7 @@
 // COM     1 element (one for the cache tag, one or more for the cached
 // COM:    commands)
 // RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-opencl-minimal \
-// RUN:    %S/../compile-minimal-test.cl %t_a.bin 1.2
+// RUN:    %S/../compile-minimal-test.cl %t_a.bin 1.2 | FileCheck --check-prefix=STORED %s
 // RUN: llvm-objdump -d %t_a.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: COUNT_BEFORE=$(ls "%t.cache" | wc -l)
 
@@ -29,8 +38,14 @@
 // RUN: [ 4 -eq $COUNT_BEFORE ]
 //
 // RUN: AMD_COMGR_CACHE_DIR=%t.cache compile-opencl-minimal \
-// RUN:    %S/../compile-minimal-test.cl %t_b.bin 1.2
+// RUN:    %S/../compile-minimal-test.cl %t_b.bin 1.2 | FileCheck --check-prefix=FOUND %s
 // RUN: llvm-objdump -d %t_b.bin | FileCheck %S/../compile-minimal-test.cl
 // RUN: COUNT_AFTER=$(ls "%t.cache" | wc -l)
 // RUN: [ $COUNT_AFTER = $COUNT_BEFORE ]
 //
+
+// COM: check that an entry is stored
+// STORED: Comgr cache: stored entry
+
+// COM: check that an entry is found
+// FOUND: Comgr cache: found entry