OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Use genxml register support for L3 Cache config

Browse Source 
The programming of the L3 Cache registers should match the previous
manually packed LRI values.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Jordan Justen
2016-03-24 13:05:04 -07:00
parent 7a03fb9ccb
commit 8f3c236674
2 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/intel/vulkan/gen7_cmd_buffer.c
View File

@@ -294,17 +294,10 @@ flush_compute_descriptor_set(struct anv_cmd_buffer *cmd_buffer)
return VK_SUCCESS; return VK_SUCCESS;
} }
static void #define emit_lri(batch, reg, imm) \
emit_lri(struct anv_batch *batch, uint32_t reg, uint32_t imm) anv_batch_emit(batch, GENX(MI_LOAD_REGISTER_IMM), \
{ .RegisterOffset = __anv_reg_num(reg), \
anv_batch_emit(batch, GENX(MI_LOAD_REGISTER_IMM), .DataDWord = imm)
.RegisterOffset = reg,
.DataDWord = imm);
}
#define GEN7_L3SQCREG1 0xb010
#define GEN7_L3CNTLREG2 0xb020
#define GEN7_L3CNTLREG3 0xb024
void void
genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, bool enable_slm) genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, bool enable_slm)
@@ -315,12 +308,19 @@ genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, bool enable_slm)
* - src/mesa/drivers/dri/i965/gen7_l3_state.c * - src/mesa/drivers/dri/i965/gen7_l3_state.c
*/ */
uint32_t l3c2_val = enable_slm ? uint32_t l3cr2_slm, l3cr2_noslm;
/* All = 0 ways; URB = 16 ways; DC and RO = 16; SLM = 1 */ anv_pack_struct(&l3cr2_noslm, GENX(L3CNTLREG2),
/*0x02040021*/0x010000a1 : .URBAllocation = 24,
/* All = 0 ways; URB = 32 ways; DC = 0; RO = 32; SLM = 0 */ .ROAllocation = 0,
/*0x04080040*/0x02000030; .DCAllocation = 16);
bool changed = cmd_buffer->state.current_l3_config != l3c2_val; anv_pack_struct(&l3cr2_slm, GENX(L3CNTLREG2),
.SLMEnable = 1,
.URBAllocation = 16,
.URBLowBandwidth = 1,
.ROAllocation = 0,
.DCAllocation = 8);
const uint32_t l3cr2_val = enable_slm ? l3cr2_slm : l3cr2_noslm;
bool changed = cmd_buffer->state.current_l3_config != l3cr2_val;
if (changed) { if (changed) {
/* According to the hardware docs, the L3 partitioning can only be changed /* According to the hardware docs, the L3 partitioning can only be changed
@@ -346,10 +346,21 @@ genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, bool enable_slm)
.CommandStreamerStallEnable = true); .CommandStreamerStallEnable = true);
anv_finishme("write GEN7_L3SQCREG1"); anv_finishme("write GEN7_L3SQCREG1");
emit_lri(&cmd_buffer->batch, GEN7_L3CNTLREG2, l3c2_val); emit_lri(&cmd_buffer->batch, GENX(L3CNTLREG2), l3cr2_val);
emit_lri(&cmd_buffer->batch, GEN7_L3CNTLREG3,
enable_slm ? 0x00040810 : 0x00040410); uint32_t l3cr3_slm, l3cr3_noslm;
cmd_buffer->state.current_l3_config = l3c2_val; anv_pack_struct(&l3cr3_noslm, GENX(L3CNTLREG3),
.ISAllocation = 8,
.CAllocation = 4,
.TAllocation = 8);
anv_pack_struct(&l3cr3_slm, GENX(L3CNTLREG3),
.ISAllocation = 8,
.CAllocation = 8,
.TAllocation = 8);
const uint32_t l3cr3_val = enable_slm ? l3cr3_slm : l3cr3_noslm;
emit_lri(&cmd_buffer->batch, GENX(L3CNTLREG3), l3cr3_val);
cmd_buffer->state.current_l3_config = l3cr2_val;
} }
} }

33
src/intel/vulkan/gen8_cmd_buffer.c
View File

@@ -108,15 +108,10 @@ gen8_cmd_buffer_emit_viewport(struct anv_cmd_buffer *cmd_buffer)
} }
#endif #endif
static void #define emit_lri(batch, reg, imm) \
emit_lri(struct anv_batch *batch, uint32_t reg, uint32_t imm) anv_batch_emit(batch, GENX(MI_LOAD_REGISTER_IMM), \
{ .RegisterOffset = __anv_reg_num(reg), \
anv_batch_emit(batch, GENX(MI_LOAD_REGISTER_IMM), .DataDWord = imm)
.RegisterOffset = reg,
.DataDWord = imm);
}
#define GEN8_L3CNTLREG 0x7034
void void
genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, bool enable_slm) genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, bool enable_slm)
@@ -127,12 +122,16 @@ genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, bool enable_slm)
* - src/mesa/drivers/dri/i965/gen7_l3_state.c * - src/mesa/drivers/dri/i965/gen7_l3_state.c
*/ */
uint32_t val = enable_slm ? uint32_t l3cr_slm, l3cr_noslm;
/* All = 48 ways; URB = 16 ways; DC and RO = 0, SLM = 1 */ anv_pack_struct(&l3cr_noslm, GENX(L3CNTLREG),
0x60000021 : .URBAllocation = 48,
/* All = 48 ways; URB = 48 ways; DC, RO and SLM = 0 */ .AllAllocation = 48);
0x60000060; anv_pack_struct(&l3cr_slm, GENX(L3CNTLREG),
bool changed = cmd_buffer->state.current_l3_config != val; .SLMEnable = 1,
.URBAllocation = 16,
.AllAllocation = 48);
const uint32_t l3cr_val = enable_slm ? l3cr_slm : l3cr_noslm;
bool changed = cmd_buffer->state.current_l3_config != l3cr_val;
if (changed) { if (changed) {
/* According to the hardware docs, the L3 partitioning can only be changed /* According to the hardware docs, the L3 partitioning can only be changed
@@ -157,8 +156,8 @@ genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, bool enable_slm)
.PostSyncOperation = NoWrite, .PostSyncOperation = NoWrite,
.CommandStreamerStallEnable = true); .CommandStreamerStallEnable = true);
emit_lri(&cmd_buffer->batch, GEN8_L3CNTLREG, val); emit_lri(&cmd_buffer->batch, GENX(L3CNTLREG), l3cr_val);
cmd_buffer->state.current_l3_config = val; cmd_buffer->state.current_l3_config = l3cr_val;
} }
} }