From f2f458b6756a6205aaa96e92e75032cfa6a89cc8 Mon Sep 17 00:00:00 2001
From: Stuart Brady <stuart.brady@arm.com>
Date: Thu, 27 Jun 2019 18:15:15 +0100
Subject: [PATCH] Rename gSpirVPath to gCompilationCachePath

gSpirVPath controls the location of the compilation cache for SPIR-V
offline compilation, but its name falsely implies that it is
SPIR-V specific.  This change renames it to gCompilationCachePath.
---
 test_common/harness/kernelHelpers.c     | 9 +++++----
 test_common/harness/parseParameters.cpp | 8 ++++----
 test_common/harness/parseParameters.h   | 2 +-
 test_conformance/spirv_new/main.cpp     | 4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/test_common/harness/kernelHelpers.c b/test_common/harness/kernelHelpers.c
index 0cdc5241..0a470e27 100644
--- a/test_common/harness/kernelHelpers.c
+++ b/test_common/harness/kernelHelpers.c
@@ -173,7 +173,7 @@ std::string add_build_options(const std::string &baseName, const char *options)
     do
     {
         i++;
-        std::string fileName = gSpirVPath + slash + get_file_name(baseName, i, ".options");
+        std::string fileName = gCompilationCachePath + slash + get_file_name(baseName, i, ".options");
         long fileSize = get_file_size(fileName);
         if (fileSize == 0)
             break;
@@ -186,7 +186,8 @@ std::string add_build_options(const std::string &baseName, const char *options)
     } while (!equal);
     if (equal)
         return get_file_name(baseName, i, "");
-    std::string fileName = gSpirVPath + slash + get_file_name(baseName, i, ".options");
+
+    std::string fileName = gCompilationCachePath + slash + get_file_name(baseName, i, ".options");
     std::ofstream ofs(fileName.c_str(), std::ios::binary);
     if (!ofs.good())
     {
@@ -260,8 +261,8 @@ static int create_single_kernel_helper_create_program(cl_context context,
 
         kernelName = add_build_options(kernelName, buildOptions);
 
-        std::string sourceFilename = gSpirVPath + slash + kernelName + ".cl";
-        std::string outputFilename = gSpirVPath + slash + kernelName;
+        std::string sourceFilename = gCompilationCachePath + slash + kernelName + ".cl";
+        std::string outputFilename = gCompilationCachePath + slash + kernelName;
 
         std::string size_t_width_str;
 
diff --git a/test_common/harness/parseParameters.cpp b/test_common/harness/parseParameters.cpp
index b10d0723..8a1e79fa 100644
--- a/test_common/harness/parseParameters.cpp
+++ b/test_common/harness/parseParameters.cpp
@@ -29,7 +29,7 @@ using namespace std;
 
 CompilationMode      gCompilationMode = kOnline;
 CompilationCacheMode gCompilationCacheMode = kCacheModeCompileIfAbsent;
-std::string          gSpirVPath = ".";
+std::string          gCompilationCachePath = ".";
 
 void helpInfo ()
 {
@@ -67,7 +67,7 @@ int parseCustomParam (int argc, const char *argv[], const char *ignore)
         }
         else if (!strcmp(argv[i], "-ILPath"))
         {
-            gSpirVPath = argv[i + 1];
+            gCompilationCachePath = argv[i + 1];
             delArg = 2;
         }
         else if (!strcmp(argv[i], "-offlineCompiler"))
@@ -90,14 +90,14 @@ int parseCustomParam (int argc, const char *argv[], const char *ignore)
                         if (!strcmp(argv[i + 2], "cache"))
                         {
                             gCompilationCacheMode = kCacheModeForceRead;
-                            gSpirVPath = argv[i + 3];
+                            gCompilationCachePath = argv[i + 3];
                             log_info(" SpirV reading from cache enabled.\n");
                             delArg += 2;
                         }
                         else if (!strcmp(argv[i + 2], "generate"))
                         {
                             gCompilationCacheMode = kCacheModeOverwrite;
-                            gSpirVPath = argv[i + 3];
+                            gCompilationCachePath = argv[i + 3];
                             log_info(" SpirV force generate binaries enabled.\n");
                             delArg += 2;
                         }
diff --git a/test_common/harness/parseParameters.h b/test_common/harness/parseParameters.h
index e9f61aad..241c0708 100644
--- a/test_common/harness/parseParameters.h
+++ b/test_common/harness/parseParameters.h
@@ -35,7 +35,7 @@ enum CompilationCacheMode
 
 extern CompilationMode gCompilationMode;
 extern CompilationCacheMode gCompilationCacheMode;
-extern std::string gSpirVPath;
+extern std::string gCompilationCachePath;
 
 extern int parseCustomParam (int argc, const char *argv[], const char *ignore = 0 );
 
diff --git a/test_conformance/spirv_new/main.cpp b/test_conformance/spirv_new/main.cpp
index 63d47a04..21a42423 100644
--- a/test_conformance/spirv_new/main.cpp
+++ b/test_conformance/spirv_new/main.cpp
@@ -58,7 +58,7 @@ std::vector<unsigned char> readBinary(const char *file_name)
 
 std::vector<unsigned char> readSPIRV(const char *file_name)
 {
-    std::string full_name_str = gSpirVPath + slash + file_name + spvExt + gAddrWidth;
+    std::string full_name_str = gCompilationCachePath + slash + file_name + spvExt + gAddrWidth;
     return readBinary(full_name_str.c_str());
 }
 
@@ -97,7 +97,7 @@ static int offline_get_program_with_il(clProgramWrapper &prog,
     cl_int err = 0;
     std::string outputTypeStr = "binary";
     std::string defaultScript = std::string("..") + slash + std::string("spv_to_binary.py");
-    std::string outputFilename = gSpirVPath + slash + std::string(prog_name);
+    std::string outputFilename = gCompilationCachePath + slash + std::string(prog_name);
     std::string sourceFilename = outputFilename +  spvExt;
 
     std::string scriptArgs =