Update L0 Loader to 1.4.1 (v1.2 spec)

bmyates · Compute-Runtime-Automation · commit 52ad8b09777b · 2021-06-23T19:27:50.000+02:00
Also make changes to debug API to mitigate API break

Signed-off-by: Brandon Yates &lt;brandon.yates@intel.com&gt;
diff --git a/level_zero/api/tools/zet_debug.cpp b/level_zero/api/tools/zet_debug.cpp
@@ -91,7 +91,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL
 zetDebugReadRegisters(
     zet_debug_session_handle_t hDebug,
     ze_device_thread_t thread,
-    zet_debug_regset_type_t type,
+    uint32_t type,
     uint32_t start,
     uint32_t count,
     void *pRegisterValues) {
@@ -102,7 +102,7 @@ ZE_APIEXPORT ze_result_t ZE_APICALL
 zetDebugWriteRegisters(
     zet_debug_session_handle_t hDebug,
     ze_device_thread_t thread,
-    zet_debug_regset_type_t type,
+    uint32_t type,
     uint32_t start,
     uint32_t count,
     void *pRegisterValues) {
diff --git a/level_zero/experimental/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp b/level_zero/experimental/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -144,7 +144,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemOpenIpcHandleTracingWrapperWithOn
 
     setTracerCallbacksAndEnableTracer();
 
-    result = zeMemOpenIpcHandle_Tracing(nullptr, nullptr, ipchandle, ZE_IPC_MEMORY_FLAG_TBD, nullptr);
+    result = zeMemOpenIpcHandle_Tracing(nullptr, nullptr, ipchandle, 0, nullptr);
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);
     EXPECT_EQ(defaultUserData, 1);
 }
diff --git a/level_zero/tools/source/debug/debug_handlers.cpp b/level_zero/tools/source/debug/debug_handlers.cpp
@@ -43,11 +43,11 @@ ze_result_t debugGetRegisterSetProperties(zet_device_handle_t hDevice, uint32_t
     return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
-ze_result_t debugReadRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) {
+ze_result_t debugReadRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) {
     return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
-ze_result_t debugWriteRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) {
+ze_result_t debugWriteRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) {
     return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 } // namespace DebugApiHandlers
diff --git a/level_zero/tools/source/debug/debug_handlers.h b/level_zero/tools/source/debug/debug_handlers.h
@@ -19,7 +19,7 @@ ze_result_t debugReadMemory(zet_debug_session_handle_t hDebug, ze_device_thread_
 ze_result_t debugWriteMemory(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, const zet_debug_memory_space_desc_t *desc, size_t size, const void *buffer);
 ze_result_t debugAcknowledgeEvent(zet_debug_session_handle_t hDebug, const zet_debug_event_t *event);
 ze_result_t debugGetRegisterSetProperties(zet_device_handle_t hDevice, uint32_t *pCount, zet_debug_regset_properties_t *pRegisterSetProperties);
-ze_result_t debugReadRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues);
-ze_result_t debugWriteRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues);
+ze_result_t debugReadRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues);
+ze_result_t debugWriteRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues);
 } // namespace DebugApiHandlers
 } // namespace L0
diff --git a/level_zero/tools/source/debug/debug_session.h b/level_zero/tools/source/debug/debug_session.h
@@ -34,8 +34,8 @@ struct DebugSession : _zet_debug_session_handle_t {
     virtual ze_result_t readMemory(ze_device_thread_t thread, const zet_debug_memory_space_desc_t *desc, size_t size, void *buffer) = 0;
     virtual ze_result_t writeMemory(ze_device_thread_t thread, const zet_debug_memory_space_desc_t *desc, size_t size, const void *buffer) = 0;
     virtual ze_result_t acknowledgeEvent(const zet_debug_event_t *event) = 0;
-    virtual ze_result_t readRegisters(ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) = 0;
-    virtual ze_result_t writeRegisters(ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) = 0;
+    virtual ze_result_t readRegisters(ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) = 0;
+    virtual ze_result_t writeRegisters(ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) = 0;
     virtual ze_result_t getRegisterSetPropertiesExp(uint32_t *pCount, zet_debug_regset_properties_exp_t *pRegisterSetPropertiesExp) = 0;
 
     Device *getConnectedDevice() { return connectedDevice; }
diff --git a/level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h b/level_zero/tools/test/unit_tests/sources/debug/mock_debug_session.h
@@ -50,10 +50,10 @@ struct DebugSessionMock : public L0::RootDebugSession {
     ze_result_t acknowledgeEvent(const zet_debug_event_t *event) override {
         return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
     }
-    ze_result_t readRegisters(ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) override {
+    ze_result_t readRegisters(ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) override {
         return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
     }
-    ze_result_t writeRegisters(ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) override {
+    ze_result_t writeRegisters(ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) override {
         return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;
     }
     ze_result_t getRegisterSetPropertiesExp(uint32_t *pCount, zet_debug_regset_properties_exp_t *pRegisterSetPropertiesExp) override {
diff --git a/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp b/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp
@@ -94,7 +94,7 @@ TEST(DebugSessionTest, WhenUnsupportedFunctionCalledThenErrorIsReturned) {
     result = L0::DebugApiHandlers::debugGetRegisterSetProperties(hDevice, nullptr, nullptr);
     EXPECT_EQ(result, ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 
-    zet_debug_regset_type_t type = {ZET_DEBUG_REGSET_TYPE_INVALID};
+    uint32_t type = {0};
     result = L0::DebugApiHandlers::debugReadRegisters(session, thread, type, 0, 0, nullptr);
     EXPECT_EQ(result, ZE_RESULT_ERROR_UNSUPPORTED_FEATURE);
 
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
@@ -30,7 +30,7 @@ components:
     branch: master
     dest_dir: level_zero
     repository: https://github.com/oneapi-src/level-zero
-    revision: v1.3.7
+    revision: v1.4.1
     type: git
   libva:
     dest_dir: libva

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2020 Intel Corporation`
	`2`	`+ * Copyright (C) 2020-2021 Intel Corporation`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: MIT`
`5`	`5`	`*`
`@@ -144,7 +144,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemOpenIpcHandleTracingWrapperWithOn`
`144`	`144`
`145`	`145`	`setTracerCallbacksAndEnableTracer();`
`146`	`146`
`147`		`- result = zeMemOpenIpcHandle_Tracing(nullptr, nullptr, ipchandle, ZE_IPC_MEMORY_FLAG_TBD, nullptr);`
	`147`	`+ result = zeMemOpenIpcHandle_Tracing(nullptr, nullptr, ipchandle, 0, nullptr);`
`148`	`148`	`EXPECT_EQ(ZE_RESULT_SUCCESS, result);`
`149`	`149`	`EXPECT_EQ(defaultUserData, 1);`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,11 @@ ze_result_t debugGetRegisterSetProperties(zet_device_handle_t hDevice, uint32_t`
`43`	`43`	`return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`44`	`44`	`}`
`45`	`45`
`46`		`-ze_result_t debugReadRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) {`
	`46`	`+ze_result_t debugReadRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) {`
`47`	`47`	`return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`48`	`48`	`}`
`49`	`49`
`50`		`-ze_result_t debugWriteRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) {`
	`50`	`+ze_result_t debugWriteRegisters(zet_debug_session_handle_t hDebug, ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) {`
`51`	`51`	`return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`52`	`52`	`}`
`53`	`53`	`} // namespace DebugApiHandlers`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,10 @@ struct DebugSessionMock : public L0::RootDebugSession {`
`50`	`50`	`ze_result_t acknowledgeEvent(const zet_debug_event_t *event) override {`
`51`	`51`	`return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`52`	`52`	`}`
`53`		`- ze_result_t readRegisters(ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) override {`
	`53`	`+ ze_result_t readRegisters(ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) override {`
`54`	`54`	`return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`55`	`55`	`}`
`56`		`- ze_result_t writeRegisters(ze_device_thread_t thread, zet_debug_regset_type_t type, uint32_t start, uint32_t count, void *pRegisterValues) override {`
	`56`	`+ ze_result_t writeRegisters(ze_device_thread_t thread, uint32_t type, uint32_t start, uint32_t count, void *pRegisterValues) override {`
`57`	`57`	`return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE;`
`58`	`58`	`}`
`59`	`59`	`ze_result_t getRegisterSetPropertiesExp(uint32_t pCount, zet_debug_regset_properties_exp_t pRegisterSetPropertiesExp) override {`