fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/elk: Rename symbols for A64 OWord Block R/W messages

Browse source 
These are also present in Gfx8, so use the GFX8 instead of
GFX9 as prefix to avoid confusion.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27629>
This commit is contained in:
Caio Oliveira 2024-03-06 12:57:20 -08:00 • committed by Marge Bot
parent 05d78994a7
commit 59c5c67d22
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/intel/compiler/elk/elk_disasm.c
View file

@ -449,8 +449,8 @@ static const char *const dp_dc1_msg_type_hsw[32] = {
[GFX9_DATAPORT_DC_PORT1_A64_SCATTERED_READ] = "DC A64 scattered read",
[GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_READ] = "DC A64 untyped surface read",
[GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_ATOMIC_OP] = "DC A64 untyped atomic op",
[GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ] = "DC A64 oword block read",
[GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE] = "DC A64 oword block write",
[GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ] = "DC A64 oword block read",
[GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE] = "DC A64 oword block write",
[GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_WRITE] = "DC A64 untyped surface write",
[GFX8_DATAPORT_DC_PORT1_A64_SCATTERED_WRITE] = "DC A64 scattered write",
[GFX9_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_FLOAT_OP] =
@ -2105,8 +2105,8 @@ elk_disassemble_inst(FILE *file, const struct elk_isa_info *isa,
control(file, "atomic float op", aop_float, msg_ctrl & 0xf,
&space);
break;
case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
case GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
case GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
assert(dp_oword_block_rw[msg_ctrl & 7]);
format(file, "owords = %s, aligned = %d",
dp_oword_block_rw[msg_ctrl & 7], (msg_ctrl >> 3) & 3);

4
src/intel/compiler/elk/elk_eu.h
View file

@ -878,8 +878,8 @@ elk_dp_a64_oword_block_rw_desc(const struct intel_device_info *devinfo,
assert(!write || align_16B);
unsigned msg_type =
write ? GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE :
GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ;
write ? GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE :
GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ;
unsigned msg_control =
SET_BITS(!align_16B, 4, 3) |

4
src/intel/compiler/elk/elk_eu_defines.h
View file

@ -720,8 +720,8 @@ enum elk_message_target {
#define GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_READ 0x11
#define GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_ATOMIC_OP 0x12
#define GFX12_DATAPORT_DC_PORT1_A64_UNTYPED_ATOMIC_HALF_INT_OP 0x13
#define GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ 0x14
#define GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE 0x15
#define GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ 0x14
#define GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE 0x15
#define GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_WRITE 0x19
#define GFX8_DATAPORT_DC_PORT1_A64_SCATTERED_WRITE 0x1a
#define GFX9_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_FLOAT_OP 0x1b

4
src/intel/compiler/elk/elk_schedule_instructions.cpp
View file

@ -543,8 +543,8 @@ elk_schedule_node::set_latency_gfx7(const struct elk_isa_info *isa)
case GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_READ:
case GFX8_DATAPORT_DC_PORT1_A64_SCATTERED_WRITE:
case GFX9_DATAPORT_DC_PORT1_A64_SCATTERED_READ:
case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
case GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
case GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
/* See also GFX7_DATAPORT_DC_UNTYPED_SURFACE_READ */
latency = 300;
break;