fix driver version reporting

Change-Id: I187f1e1a71f07dbd83dfadbd9c51ff910be356b8 Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
intel · Mar 22, 2020 · 43016c6 · 43016c6
1 parent 44da4a4
commit 43016c6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/driver_version.h.in b/driver_version.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,6 @@
 #ifndef DRIVER_VERSION_H
 #define DRIVER_VERSION_H
 
-#cmakedefine NEO_DRIVER_VERSION ${NEO_DRIVER_VERSION}
+#cmakedefine NEO_OCL_DRIVER_VERSION ${NEO_OCL_DRIVER_VERSION}
 
 #endif /* DRIVER_VERSION_H */
diff --git a/opencl/source/device/device_caps.cpp b/opencl/source/device/device_caps.cpp
@@ -33,7 +33,7 @@ static std::string spirVersions = "1.2 ";
 static const char *spirvVersion = "SPIR-V_1.2 ";
 #define QTR(a) #a
 #define TOSTR(b) QTR(b)
-static std::string driverVersion = TOSTR(NEO_DRIVER_VERSION);
+static std::string driverVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
 
 const char *builtInKernels = ""; // the "always available" (extension-independent) builtin kernels
 
@@ -186,7 +186,7 @@ void ClDevice::initializeCaps() {
     deviceExtensions.clear();
     deviceExtensions.append(deviceExtensionsList);
 
-    driverVersion = TOSTR(NEO_DRIVER_VERSION);
+    driverVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
 
     // Add our graphics family name to the device name
     name += "Intel(R) ";

diff --git a/opencl/source/helpers/neo_driver_version.h b/opencl/source/helpers/neo_driver_version.h
@@ -20,7 +20,7 @@
 #define TOSTR(b) QTR(b)
 
 namespace NEO {
-constexpr const char *driverVersion = TOSTR(NEO_DRIVER_VERSION);
+constexpr const char *driverVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
 }
 
 #undef QTR

diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp
@@ -1019,7 +1019,7 @@ TEST_F(DeviceGetCapsTest, givenSystemWithNoDriverInfoWhenGettingNameAndVersionTh
 
 #define QTR(a) #a
 #define TOSTR(b) QTR(b)
-    const std::string expectedVersion = TOSTR(NEO_DRIVER_VERSION);
+    const std::string expectedVersion = TOSTR(NEO_OCL_DRIVER_VERSION);
 #undef QTR
 #undef TOSTR