From 5d0f1ca77faecb36870a5b3f6e52c106cd8c93b1 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Wed, 17 Jan 2024 20:57:23 +0900 Subject: [PATCH] agx: Rename some SRs I think these better represent what these SRs actually do. Signed-off-by: Asahi Lina Part-of: --- src/asahi/compiler/agx_opcodes.py | 8 ++++---- src/asahi/compiler/agx_validate.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/asahi/compiler/agx_opcodes.py b/src/asahi/compiler/agx_opcodes.py index dba1015070a..08b45b5b12b 100644 --- a/src/asahi/compiler/agx_opcodes.py +++ b/src/asahi/compiler/agx_opcodes.py @@ -123,7 +123,7 @@ SR = enum("sr", { 8: 'dispatch_threads_per_threadgroup.x', 9: 'dispatch_threads_per_threadgroup.y', 10: 'dispatch_threads_per_threadgroup.z', - 20: 'core_index', + 20: 'core_id', 21: 'vm_slot', 48: 'thread_position_in_threadgroup.x', 49: 'thread_position_in_threadgroup.y', @@ -140,9 +140,9 @@ SR = enum("sr", { 81: 'thread_position_in_grid.y', 82: 'thread_position_in_grid.z', 124: 'input_sample_mask', - 144: 'opfifo_cmd', - 146: 'opfifo_data_l', - 147: 'opfifo_data_h', + 144: 'helper_op', + 146: 'helper_arg_l', + 147: 'helper_arg_h', }) ATOMIC_OPC = enum("atomic_opc", { diff --git a/src/asahi/compiler/agx_validate.c b/src/asahi/compiler/agx_validate.c index e67abecaaeb..e913f6c8dc7 100644 --- a/src/asahi/compiler/agx_validate.c +++ b/src/asahi/compiler/agx_validate.c @@ -365,9 +365,9 @@ agx_validate_sr(const agx_instr *I) case AGX_SR_IS_ACTIVE_THREAD: return coverage; - case AGX_SR_OPFIFO_CMD: - case AGX_SR_OPFIFO_DATA_L: - case AGX_SR_OPFIFO_DATA_H: + case AGX_SR_HELPER_OP: + case AGX_SR_HELPER_ARG_L: + case AGX_SR_HELPER_ARG_H: return barrier; default: