Fix zetCommandListAppendMetricQueryEnd for phWaitEvent handle transla…

…tion

- Fixed zetCommandListAppendMetricQueryEnd to properly translate
  handles.

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

scripts/templates/ldrddi.cpp.mako

@@ -175,6 +175,15 @@ namespace loader
  }
  }
  %endif
+ %if re.match(r"\w+CommandListAppendMetricQueryEnd$", th.make_func_name(n, tags, obj)):
+ // convert loader handles to driver handles
+ auto phWaitEventsLocal = new ze_event_handle_t [numWaitEvents];
+ for( size_t i = 0; ( nullptr != phWaitEvents ) && ( i < numWaitEvents ); ++i )
+ phWaitEventsLocal[ i ] = reinterpret_cast<ze_event_object_t*>( phWaitEvents[ i ] )->handle;
+
+ // forward to device-driver
+ result = pfnAppendMetricQueryEnd( hCommandList, hMetricQuery, hSignalEvent, numWaitEvents, phWaitEventsLocal );
+ %else:
  // forward to device-driver
  %if add_local:
  result = ${th.make_pfn_name(n, tags, obj)}( ${", ".join(th.make_param_lines(n, tags, obj, format=["name", "local"]))} );
@@ -188,6 +197,7 @@ namespace loader
  result = ${th.make_pfn_name(n, tags, obj)}( ${", ".join(th.make_param_lines(n, tags, obj, format=["name"]))} );
  %endif
  %endif
+ %endif
 <%
  del arrays_to_delete
  del add_local%>

source/loader/zet_ldrddi.cpp

@@ -1026,8 +1026,13 @@ namespace loader
  // convert loader handle to driver handle
  hSignalEvent = ( hSignalEvent ) ? reinterpret_cast<ze_event_object_t*>( hSignalEvent )->handle : nullptr;
 
+ // convert loader handles to driver handles
+ auto phWaitEventsLocal = new ze_event_handle_t [numWaitEvents];
+ for( size_t i = 0; ( nullptr != phWaitEvents ) && ( i < numWaitEvents ); ++i )
+ phWaitEventsLocal[ i ] = reinterpret_cast<ze_event_object_t*>( phWaitEvents[ i ] )->handle;
+
  // forward to device-driver
- result = pfnAppendMetricQueryEnd( hCommandList, hMetricQuery, hSignalEvent, numWaitEvents, phWaitEvents );
+ result = pfnAppendMetricQueryEnd( hCommandList, hMetricQuery, hSignalEvent, numWaitEvents, phWaitEventsLocal );
 
  return result;
  }