intel: intel_dump_gpu: use simulator id in captures

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>

diff --git a/src/intel/tools/intel_aub.h b/src/intel/tools/intel_aub.h
index 2888515048fdf7e8cd7c8395402202d1f5e02f43..74ca26ab9bba3ad5f22787b98cc04669e5b87c01 100644 (file)
--- a/src/intel/tools/intel_aub.h
+++ b/src/intel/tools/intel_aub.h
@@ -103,7 +103,7 @@
 /* DW2 */
 
 #define AUB_MEM_TRACE_VERSION_DEVICE_MASK      0x0000ff00
-#define AUB_MEM_TRACE_VERSION_DEVICE_CNL       (15 << 8)
+#define AUB_MEM_TRACE_VERSION_DEVICE_SHIFT      8
 
 #define AUB_MEM_TRACE_VERSION_METHOD_MASK      0x000c0000
 #define AUB_MEM_TRACE_VERSION_METHOD_PHY       (1 << 18)

diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index a9ce109b2b6691c79667b19f61cb6d86b5c81abb..6107035d5bcb9022a55d8f1695a151c026c78277 100644 (file)
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -512,7 +512,7 @@ write_execlists_header(void)
    dwords = 5 + app_name_len / sizeof(uint32_t);
    dword_out(CMD_MEM_TRACE_VERSION | (dwords - 1));
    dword_out(AUB_MEM_TRACE_VERSION_FILE_VERSION);
-   dword_out(AUB_MEM_TRACE_VERSION_DEVICE_CNL);
+   dword_out(devinfo.simulator_id << AUB_MEM_TRACE_VERSION_DEVICE_SHIFT);
    dword_out(0);      /* version */
    dword_out(0);      /* version */
    data_out(app_name, app_name_len);