diff --git a/test_common/harness/kernelHelpers.c b/test_common/harness/kernelHelpers.c index dda79872..0f3b9172 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; @@ -187,7 +187,7 @@ std::string add_build_options(const std::string &baseName, const char *options) 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()) { @@ -266,8 +266,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; // Get device CL_DEVICE_ADDRESS_BITS cl_uint device_address_space_size = 0; diff --git a/test_common/harness/parseParameters.cpp b/test_common/harness/parseParameters.cpp index 4e5ca42b..2c54bb6b 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 () { @@ -82,14 +82,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 );