From c135317de106c59b0c326395ce15b901f2d4595d Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Thu, 15 Dec 2016 23:57:10 -0800 Subject: VideoCore/Shader: Extract DebugData out from UnitState --- src/video_core/shader/shader_interpreter.cpp | 146 +++++++++++++-------------- 1 file changed, 72 insertions(+), 74 deletions(-) (limited to 'src/video_core/shader/shader_interpreter.cpp') diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp index 29f3ff684..70db4167e 100644 --- a/src/video_core/shader/shader_interpreter.cpp +++ b/src/video_core/shader/shader_interpreter.cpp @@ -39,7 +39,8 @@ struct CallStackElement { }; template -void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned offset) { +void RunInterpreter(const ShaderSetup& setup, UnitState& state, DebugData& debug_data, + unsigned offset) { // TODO: Is there a maximal size for this? boost::container::static_vector call_stack; u32 program_counter = offset; @@ -104,11 +105,11 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned const Instruction instr = {program_code[program_counter]}; const SwizzlePattern swizzle = {swizzle_data[instr.common.operand_desc_id]}; - Record(state.debug, iteration, program_counter); + Record(debug_data, iteration, program_counter); if (iteration > 0) - Record(state.debug, iteration - 1, program_counter); + Record(debug_data, iteration - 1, program_counter); - state.debug.max_offset = std::max(state.debug.max_offset, 1 + program_counter); + debug_data.max_offset = std::max(debug_data.max_offset, 1 + program_counter); auto LookupSourceRegister = [&](const SourceRegister& source_reg) -> const float24* { switch (source_reg.GetRegisterType()) { @@ -176,54 +177,54 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned ? &state.registers.temporary[instr.common.dest.Value().GetIndex()][0] : dummy_vec4_float24; - state.debug.max_opdesc_id = - std::max(state.debug.max_opdesc_id, 1 + instr.common.operand_desc_id); + debug_data.max_opdesc_id = + std::max(debug_data.max_opdesc_id, 1 + instr.common.operand_desc_id); switch (instr.opcode.Value().EffectiveOpCode()) { case OpCode::Id::ADD: { - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; dest[i] = src1[i] + src2[i]; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; } case OpCode::Id::MUL: { - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; dest[i] = src1[i] * src2[i]; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; } case OpCode::Id::FLR: - Record(state.debug, iteration, src1); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; dest[i] = float24::FromFloat32(std::floor(src1[i].ToFloat32())); } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; case OpCode::Id::MAX: - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; @@ -233,13 +234,13 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned // max(NaN, 0) -> 0 dest[i] = (src1[i] > src2[i]) ? src1[i] : src2[i]; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; case OpCode::Id::MIN: - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; @@ -249,16 +250,16 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned // min(NaN, 0) -> 0 dest[i] = (src1[i] < src2[i]) ? src1[i] : src2[i]; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; case OpCode::Id::DP3: case OpCode::Id::DP4: case OpCode::Id::DPH: case OpCode::Id::DPHI: { - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); + Record(debug_data, iteration, dest); OpCode::Id opcode = instr.opcode.Value().EffectiveOpCode(); if (opcode == OpCode::Id::DPH || opcode == OpCode::Id::DPHI) @@ -274,14 +275,14 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned dest[i] = dot; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; } // Reciprocal case OpCode::Id::RCP: { - Record(state.debug, iteration, src1); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, dest); float24 rcp_res = float24::FromFloat32(1.0f / src1[0].ToFloat32()); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) @@ -289,14 +290,14 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned dest[i] = rcp_res; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; } // Reciprocal Square Root case OpCode::Id::RSQ: { - Record(state.debug, iteration, src1); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, dest); float24 rsq_res = float24::FromFloat32(1.0f / std::sqrt(src1[0].ToFloat32())); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) @@ -304,12 +305,12 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned dest[i] = rsq_res; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; } case OpCode::Id::MOVA: { - Record(state.debug, iteration, src1); + Record(debug_data, iteration, src1); for (int i = 0; i < 2; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; @@ -317,29 +318,29 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned // TODO: Figure out how the rounding is done on hardware state.address_registers[i] = static_cast(src1[i].ToFloat32()); } - Record(state.debug, iteration, + Record(debug_data, iteration, state.address_registers); break; } case OpCode::Id::MOV: { - Record(state.debug, iteration, src1); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; dest[i] = src1[i]; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; } case OpCode::Id::SGE: case OpCode::Id::SGEI: - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; @@ -347,14 +348,14 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned dest[i] = (src1[i] >= src2[i]) ? float24::FromFloat32(1.0f) : float24::FromFloat32(0.0f); } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; case OpCode::Id::SLT: case OpCode::Id::SLTI: - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; @@ -362,12 +363,12 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned dest[i] = (src1[i] < src2[i]) ? float24::FromFloat32(1.0f) : float24::FromFloat32(0.0f); } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; case OpCode::Id::CMP: - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); for (int i = 0; i < 2; ++i) { // TODO: Can you restrict to one compare via dest masking? @@ -404,12 +405,12 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned break; } } - Record(state.debug, iteration, state.conditional_code); + Record(debug_data, iteration, state.conditional_code); break; case OpCode::Id::EX2: { - Record(state.debug, iteration, src1); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, dest); // EX2 only takes first component exp2 and writes it to all dest components float24 ex2_res = float24::FromFloat32(std::exp2(src1[0].ToFloat32())); @@ -420,13 +421,13 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned dest[i] = ex2_res; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; } case OpCode::Id::LG2: { - Record(state.debug, iteration, src1); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, dest); // LG2 only takes the first component log2 and writes it to all dest components float24 lg2_res = float24::FromFloat32(std::log2(src1[0].ToFloat32())); @@ -437,7 +438,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned dest[i] = lg2_res; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); break; } @@ -519,17 +520,17 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned ? &state.registers.temporary[instr.mad.dest.Value().GetIndex()][0] : dummy_vec4_float24; - Record(state.debug, iteration, src1); - Record(state.debug, iteration, src2); - Record(state.debug, iteration, src3); - Record(state.debug, iteration, dest); + Record(debug_data, iteration, src1); + Record(debug_data, iteration, src2); + Record(debug_data, iteration, src3); + Record(debug_data, iteration, dest); for (int i = 0; i < 4; ++i) { if (!swizzle.DestComponentEnabled(i)) continue; dest[i] = src1[i] * src2[i] + src3[i]; } - Record(state.debug, iteration, dest); + Record(debug_data, iteration, dest); } else { LOG_ERROR(HW_GPU, "Unhandled multiply-add instruction: 0x%02x (%s): 0x%08x", (int)instr.opcode.Value().EffectiveOpCode(), @@ -546,8 +547,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned break; case OpCode::Id::JMPC: - Record(state.debug, iteration, - state.conditional_code); + Record(debug_data, iteration, state.conditional_code); if (evaluate_condition(instr.flow_control)) { program_counter = instr.flow_control.dest_offset - 1; } @@ -555,7 +555,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned case OpCode::Id::JMPU: Record( - state.debug, iteration, uniforms.b[instr.flow_control.bool_uniform_id]); + debug_data, iteration, uniforms.b[instr.flow_control.bool_uniform_id]); if (uniforms.b[instr.flow_control.bool_uniform_id] == !(instr.flow_control.num_instructions & 1)) { @@ -570,7 +570,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned case OpCode::Id::CALLU: Record( - state.debug, iteration, uniforms.b[instr.flow_control.bool_uniform_id]); + debug_data, iteration, uniforms.b[instr.flow_control.bool_uniform_id]); if (uniforms.b[instr.flow_control.bool_uniform_id]) { call(instr.flow_control.dest_offset, instr.flow_control.num_instructions, program_counter + 1, 0, 0); @@ -578,8 +578,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned break; case OpCode::Id::CALLC: - Record(state.debug, iteration, - state.conditional_code); + Record(debug_data, iteration, state.conditional_code); if (evaluate_condition(instr.flow_control)) { call(instr.flow_control.dest_offset, instr.flow_control.num_instructions, program_counter + 1, 0, 0); @@ -591,7 +590,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned case OpCode::Id::IFU: Record( - state.debug, iteration, uniforms.b[instr.flow_control.bool_uniform_id]); + debug_data, iteration, uniforms.b[instr.flow_control.bool_uniform_id]); if (uniforms.b[instr.flow_control.bool_uniform_id]) { call(program_counter + 1, instr.flow_control.dest_offset - program_counter - 1, instr.flow_control.dest_offset + instr.flow_control.num_instructions, 0, @@ -607,8 +606,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned case OpCode::Id::IFC: { // TODO: Do we need to consider swizzlers here? - Record(state.debug, iteration, - state.conditional_code); + Record(debug_data, iteration, state.conditional_code); if (evaluate_condition(instr.flow_control)) { call(program_counter + 1, instr.flow_control.dest_offset - program_counter - 1, instr.flow_control.dest_offset + instr.flow_control.num_instructions, 0, @@ -629,7 +627,7 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned uniforms.i[instr.flow_control.int_uniform_id].w); state.address_registers[2] = loop_param.y; - Record(state.debug, iteration, loop_param); + Record(debug_data, iteration, loop_param); call(program_counter + 1, instr.flow_control.dest_offset - program_counter + 1, instr.flow_control.dest_offset + 1, loop_param.x, loop_param.z); break; @@ -652,8 +650,8 @@ void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned } // Explicit instantiation -template void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned offset); -template void RunInterpreter(const ShaderSetup& setup, UnitState& state, unsigned offset); +template void RunInterpreter(const ShaderSetup&, UnitState&, DebugData&, unsigned offset); +template void RunInterpreter(const ShaderSetup&, UnitState&, DebugData&, unsigned offset); } // namespace -- cgit v1.2.3