VMovrelsB32 opcode fix (#825)

This commit is contained in:
Astell
2026-08-17 23:00:28 +02:00
committed by GitHub
parent 7521295ee1
commit ad115ddcbc
4 changed files with 319 additions and 0 deletions
@@ -101,6 +101,12 @@ public static partial class Gen5SpirvTranslator
return false; return false;
} }
if (instruction.Opcode is "VMovrelsB32" or "VMovreldB32" or
"VMovrelsdB32" or "VMovrelsd2B32")
{
return TryEmitMoveRelative(instruction, destination, out error);
}
uint result; uint result;
switch (instruction.Opcode) switch (instruction.Opcode)
{ {
@@ -1013,6 +1019,76 @@ public static partial class Gen5SpirvTranslator
return true; return true;
} }
// V_MOVREL*_B32: register-relative moves. M0 is added at run time to the
// source and/or destination register number encoded in the instruction,
// which is how shader compilers implement a dynamically indexed array
// that stayed in registers instead of being spilled to memory. Astro Bot
// ships pixel shaders that index a small register-resident table this
// way; without this the whole shader fails to translate.
//
// V_MOVRELS_B32 vdst = vgpr[src0 + M0]
// V_MOVRELD_B32 vgpr[vdst + M0] = src0
// V_MOVRELSD_B32 vgpr[vdst + M0] = vgpr[src0 + M0]
// V_MOVRELSD_2_B32 vgpr[vdst + M0[25:16]] = vgpr[src0 + M0[9:0]]
//
// The relative forms address the VGPR file relative to the wave's own
// allocation base, which is exactly what the private register array
// models, so the encoded number and M0 simply add.
private bool TryEmitMoveRelative(
Gen5ShaderInstruction instruction,
uint destination,
out string error)
{
error = string.Empty;
if (instruction.Sources.Count == 0)
{
error = $"missing source for {instruction.Opcode}";
return false;
}
var m0 = LoadS(M0ScalarRegister);
uint sourceOffset;
uint destinationOffset;
if (instruction.Opcode == "VMovrelsd2B32")
{
sourceOffset = BitwiseAnd(m0, UInt(0x3FF));
destinationOffset = BitwiseAnd(ShiftRightLogical(m0, UInt(16)), UInt(0x3FF));
}
else
{
sourceOffset = m0;
destinationOffset = m0;
}
uint value;
if (instruction.Opcode == "VMovreldB32")
{
// Only the destination is relative here; src0 is an ordinary
// operand and may be an SGPR or an inline/literal constant.
value = GetRawSource(instruction, 0);
}
else
{
var source = instruction.Sources[0];
if (source.Kind != Gen5OperandKind.VectorRegister)
{
error = $"{instruction.Opcode} source must be a vector register";
return false;
}
value = LoadVDynamic(IAdd(UInt(source.Value), sourceOffset));
}
if (instruction.Opcode == "VMovrelsB32")
{
StoreV(destination, value);
return true;
}
StoreVDynamic(IAdd(UInt(destination), destinationOffset), value);
return true;
}
// Packed f16 (VOP3P) arithmetic. Each source register holds two f16 values, // Packed f16 (VOP3P) arithmetic. Each source register holds two f16 values,
// one per result lane. Every f16<->f32 conversion is done with the explicit // one per result lane. Every f16<->f32 conversion is done with the explicit
// integer sequences below (EmitHalfToFloat / EmitFloatToHalf) instead of // integer sequences below (EmitHalfToFloat / EmitFloatToHalf) instead of
@@ -176,6 +176,11 @@ public static partial class Gen5SpirvTranslator
private const uint ImageDescriptorDwords = 8; private const uint ImageDescriptorDwords = 8;
private const uint SamplerDescriptorDwords = 4; private const uint SamplerDescriptorDwords = 4;
private const int ScalarRegisterCount = 128; private const int ScalarRegisterCount = 128;
// M0. Used as the runtime index added to the register numbers encoded in
// the V_MOVREL* instructions, and as the LDS/GDS base elsewhere.
private const uint M0ScalarRegister = 124;
private const long InitialScalarDefinition = -1; private const long InitialScalarDefinition = -1;
private const long ConflictingScalarDefinition = -2; private const long ConflictingScalarDefinition = -2;
private const long UnreachableScalarDefinition = -3; private const long UnreachableScalarDefinition = -3;
@@ -5090,6 +5095,33 @@ public static partial class Gen5SpirvTranslator
_vectorRegisters, _vectorRegisters,
UInt(register)); UInt(register));
// The V_MOVREL* opcodes address the VGPR file with a register number that
// is only known at run time (encoded number + M0), so the access chain
// takes a computed index instead of a constant. The index is masked to
// the array bounds: SPIR-V leaves an out-of-range Private access chain
// undefined, and a mask costs nothing next to the surrounding load.
private uint DynamicVectorPointer(uint registerIndex) =>
_module.AddInstruction(
SpirvOp.AccessChain,
_privateUintPointer,
_vectorRegisters,
BitwiseAnd(registerIndex, UInt(VectorRegisterCount - 1)));
private uint LoadVDynamic(uint registerIndex) =>
Load(_uintType, DynamicVectorPointer(registerIndex));
private void StoreVDynamic(uint registerIndex, uint value)
{
var pointer = DynamicVectorPointer(registerIndex);
value = _module.AddInstruction(
SpirvOp.Select,
_uintType,
Load(_boolType, _exec),
value,
Load(_uintType, pointer));
Store(pointer, value);
}
private uint PackedHalfPointer(uint register) => private uint PackedHalfPointer(uint register) =>
_module.AddInstruction( _module.AddInstruction(
SpirvOp.AccessChain, SpirvOp.AccessChain,
@@ -947,6 +947,7 @@ public static class Gen5ShaderTranslator
0x42 => "VMovreldB32", 0x42 => "VMovreldB32",
0x43 => "VMovrelsB32", 0x43 => "VMovrelsB32",
0x44 => "VMovrelsdB32", 0x44 => "VMovrelsdB32",
0x48 => "VMovrelsd2B32",
_ => string.Empty, _ => string.Empty,
}; };
@@ -0,0 +1,210 @@
// Copyright (C) 2026 SharpEmu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
using System.Buffers.Binary;
using SharpEmu.HLE;
using SharpEmu.ShaderCompiler;
using SharpEmu.ShaderCompiler.Vulkan;
using Xunit;
namespace SharpEmu.Libs.Tests.Agc;
// Regression tests for the VOP1 register-relative moves V_MOVRELD_B32 /
// V_MOVRELS_B32 / V_MOVRELSD_B32 / V_MOVRELSD_2_B32 (opcodes 0x42/0x43/0x44/
// 0x48). These add M0 at run time to the source and/or destination register
// number encoded in the instruction, which is how a shader compiler implements
// a dynamically indexed array that stayed in registers. The decoder named them
// but nothing lowered them, so they hit the vector-ALU switch default and failed
// emission ("unsupported vector opcode"), dropping the whole shader — Astro Bot
// ships pixel shaders that use V_MOVRELS_B32.
//
// The register file is a private uint array, so the lowering is an OpAccessChain
// with a computed (non-constant) index. Each test therefore asserts both that
// the shader survives translation and that the relative operand really became a
// dynamic index rather than a constant one.
public sealed class Gen5MoveRelativeSpirvTests
{
private const ulong ShaderAddress = 0x1_0000_0000;
// VOP1: [31:25]=0b0111111, [24:17]=vdst, [16:9]=op, [8:0]=src0
// (src0 >= 256 selects a VGPR).
private const uint Vop1 = 0x7E000000;
// SOP1 s_mov_b32 m0, <inline 2>: [31:23]=0b101111101, [22:16]=sdst,
// [15:8]=op(0x03), [7:0]=ssrc0. m0 is SGPR 124, inline constant 2 is 130.
private const uint SMovM0 = 0xBE800000u | (124u << 16) | (0x03u << 8) | 130u;
[Fact]
public void MovrelsB32_ReadsTheSourceRegisterThroughADynamicIndex()
{
// s_mov_b32 m0, 2 ; v_movrels_b32 v5, v3 -> v5 = vgpr[3 + m0]
var spirv = Compile([SMovM0, Vop1 | (5u << 17) | (0x43u << 9) | (256u + 3u)]);
Assert.True(
HasDynamicVectorRegisterAccess(spirv),
"V_MOVRELS_B32 must index the VGPR array with a computed index");
}
[Fact]
public void MovreldB32_WritesTheDestinationRegisterThroughADynamicIndex()
{
// s_mov_b32 m0, 2 ; v_movreld_b32 v5, v3 -> vgpr[5 + m0] = v3
var spirv = Compile([SMovM0, Vop1 | (5u << 17) | (0x42u << 9) | (256u + 3u)]);
Assert.True(
HasDynamicVectorRegisterAccess(spirv),
"V_MOVRELD_B32 must index the VGPR array with a computed index");
}
[Fact]
public void MovrelsdB32_TranslatesWithoutDroppingShader()
{
// s_mov_b32 m0, 2 ; v_movrelsd_b32 v5, v3 -> vgpr[5 + m0] = vgpr[3 + m0]
var spirv = Compile([SMovM0, Vop1 | (5u << 17) | (0x44u << 9) | (256u + 3u)]);
Assert.True(
HasDynamicVectorRegisterAccess(spirv),
"V_MOVRELSD_B32 must index the VGPR array with a computed index");
}
[Fact]
public void Movrelsd2B32_TranslatesWithoutDroppingShader()
{
// s_mov_b32 m0, 2 ; v_movrelsd_2_b32 v5, v3, which splits m0 into two
// 10-bit halves (source index in [9:0], destination index in [25:16]).
var spirv = Compile([SMovM0, Vop1 | (5u << 17) | (0x48u << 9) | (256u + 3u)]);
Assert.True(
HasDynamicVectorRegisterAccess(spirv),
"V_MOVRELSD_2_B32 must index the VGPR array with a computed index");
}
[Fact]
public void MovrelsB32_RejectsANonVectorSource()
{
// v_movrels_b32 v5, s3. The relative source is architecturally a VGPR;
// an SGPR encoding is malformed and must fail translation rather than
// silently read the wrong register file.
Assert.False(
TryCompile(
[SMovM0, Vop1 | (5u << 17) | (0x43u << 9) | 3u],
out _,
out var error));
Assert.Contains("vector register", error, StringComparison.Ordinal);
}
// True when some OpAccessChain into the "vgpr" array uses an index that is
// not an OpConstant — i.e. a register number computed from M0.
private static bool HasDynamicVectorRegisterAccess(byte[] spirv)
{
var vectorRegisters = FindNamedId(spirv, "vgpr");
Assert.True(vectorRegisters != 0, "the module must name its VGPR array");
var constants = new HashSet<uint>();
foreach (var (op, wordCount, offset) in EnumerateInstructions(spirv))
{
// OpConstant = 43, OpConstantNull = 46: (opcode, resultType, resultId, ...).
if (op is 43 or 46 && wordCount >= 3)
{
constants.Add(ReadWord(spirv, offset + 8));
}
}
foreach (var (op, wordCount, offset) in EnumerateInstructions(spirv))
{
// OpAccessChain = 65: (opcode, resultType, resultId, base, index...).
if (op != 65 || wordCount < 5 || ReadWord(spirv, offset + 12) != vectorRegisters)
{
continue;
}
if (!constants.Contains(ReadWord(spirv, offset + 16)))
{
return true;
}
}
return false;
}
// Result id of the OpName whose literal string matches, or 0.
private static uint FindNamedId(byte[] spirv, string name)
{
foreach (var (op, wordCount, offset) in EnumerateInstructions(spirv))
{
// OpName = 5: (opcode, target, literal string...).
if (op != 5 || wordCount < 3)
{
continue;
}
var bytes = spirv.AsSpan(offset + 8, (wordCount - 2) * sizeof(uint));
var terminator = bytes.IndexOf((byte)0);
var text = System.Text.Encoding.UTF8.GetString(
terminator < 0 ? bytes : bytes[..terminator]);
if (text == name)
{
return ReadWord(spirv, offset + 4);
}
}
return 0;
}
private static IEnumerable<(ushort Op, int WordCount, int Offset)> EnumerateInstructions(
byte[] spirv)
{
// 5-word SPIR-V header, then (wordCount << 16 | opcode) packed instructions.
for (var offset = 5 * sizeof(uint); offset + sizeof(uint) <= spirv.Length;)
{
var word = ReadWord(spirv, offset);
var wordCount = (int)(word >> 16);
if (wordCount <= 0)
{
yield break;
}
yield return ((ushort)word, wordCount, offset);
offset += wordCount * sizeof(uint);
}
}
private static uint ReadWord(byte[] spirv, int offset) =>
BinaryPrimitives.ReadUInt32LittleEndian(spirv.AsSpan(offset, sizeof(uint)));
private static byte[] Compile(uint[] programWords)
{
Assert.True(TryCompile(programWords, out var spirv, out var error), error);
return spirv;
}
private static bool TryCompile(uint[] programWords, out byte[] spirv, out string error)
{
spirv = [];
var memory = new FakeCpuMemory(ShaderAddress, 0x2000);
var ctx = new CpuContext(memory, Generation.Gen5);
Gen5ShaderAtomicDecodeTests.WriteProgram(memory, ShaderAddress, programWords);
var shaderRegisters = new Dictionary<uint, uint>
{
[Gen5ShaderAtomicDecodeTests.ComputePgmRsrc2Register] = 16u << 1,
};
if (!Gen5ShaderTranslator.TryCreateState(
ctx,
ShaderAddress,
0,
shaderRegisters,
Gen5ShaderAtomicDecodeTests.ComputeUserDataRegister,
out var state,
out error) ||
!Gen5ShaderScalarEvaluator.TryEvaluate(ctx, state, out var evaluation, out error) ||
!Gen5SpirvTranslator.TryCompileComputeShader(
state, evaluation, 1, 1, 1, out var shader, out error))
{
return false;
}
spirv = shader.Spirv;
return true;
}
}