Fix zer tracing check and get last error given ddi failed

Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>

Author: nrspruit

.github/workflows/build-quick-static-n-1.yml

@@ -28,6 +28,10 @@ jobs:
           fetch-depth: 0
           path: master
 
+      - name: Copy the tests from PR to Master
+        run: |
+          cp -r pr/test/* master/test/
+
       # Build static loader from master branch
       - name: Build Static Loader from master
         run: |
@@ -85,6 +89,10 @@ jobs:
           fetch-depth: 0
           path: master
 
+      - name: Copy the tests from PR to Master
+        run: |
+          xcopy /E /I /Y pr\test\* master\test\
+
       # Build static loader from master branch
       - name: Build Static Loader from master
         run: |

scripts/templates/ldrddi_driver_ddi.cpp.mako

@@ -103,6 +103,9 @@ namespace loader_driver_ddi
         // Check if the default driver supports DDI Handles
         if (loader::context->defaultZerDriverHandle == nullptr) {
             %if ret_type == 'ze_result_t':
+            if (loader::context->zeDrivers.front().zerddiInitResult == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+                return ${X}_RESULT_ERROR_UNSUPPORTED_FEATURE;
+            }
             return ${X}_RESULT_ERROR_UNINITIALIZED;
             %else:
             if (loader::context->zeDrivers.front().zerddiInitResult == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {

source/loader/zer_ldrddi_driver_ddi.cpp

@@ -29,6 +29,9 @@ namespace loader_driver_ddi
 
         // Check if the default driver supports DDI Handles
         if (loader::context->defaultZerDriverHandle == nullptr) {
+            if (loader::context->zeDrivers.front().zerddiInitResult == ZE_RESULT_ERROR_UNSUPPORTED_FEATURE) {
+                return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
+            }
             return ZE_RESULT_ERROR_UNINITIALIZED;
         }
         auto dditable = reinterpret_cast<ze_handle_t*>( loader::context->defaultZerDriverHandle )->pRuntime;

test/loader_tracing_layer.cpp

@@ -978,8 +978,9 @@ namespace
         const char *errorString = nullptr;
         ze_result_t result = zerGetLastErrorDescription(&errorString);
         EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result);
-        EXPECT_EQ(0, tracingData.getZerPrologueCallCount("zerGetLastErrorDescription"));
-        EXPECT_EQ(0, tracingData.getZerEpilogueCallCount("zerGetLastErrorDescription"));
+        // ZER callbacks should still be called in the tracing layer even if the driver ends up not supporting ZER APIs
+        EXPECT_EQ(1, tracingData.getZerPrologueCallCount("zerGetLastErrorDescription"));
+        EXPECT_EQ(1, tracingData.getZerEpilogueCallCount("zerGetLastErrorDescription"));
 
         callBasicZeApis(drivers);
         verifyBasicZeApisCalledBothCallbackTypes(1);
@@ -993,8 +994,9 @@ namespace
         errorString = nullptr;
         result = zerGetLastErrorDescription(&errorString);
         EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result);
-        EXPECT_EQ(0, tracingData.getZerPrologueCallCount("zerGetLastErrorDescription"));
-        EXPECT_EQ(0, tracingData.getZerEpilogueCallCount("zerGetLastErrorDescription"));
+        // ZER callbacks should still be called in the tracing layer even if the driver ends up not supporting ZER APIs
+        EXPECT_EQ(2, tracingData.getZerPrologueCallCount("zerGetLastErrorDescription"));
+        EXPECT_EQ(2, tracingData.getZerEpilogueCallCount("zerGetLastErrorDescription"));
 
         uint32_t deviceCount = 1;
         std::vector<ze_device_handle_t> devices(deviceCount);