mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-21 03:39:57 -04:00
Declare StorageImageReadWithoutFormat when the translator reads an image that has no format.
The translator declares every float storage image without a format and turns a load of it into OpImageRead, which SPIR-V allows only in a module that declares StorageImageReadWithoutFormat; only the write-side capability was declared. Of the 44,206 shader variants a 0.7.1 install stores, 117 compute shaders were invalid SPIR-V for that reason (the contributor's sweep with spirv-val, for NVIDIA's, AMD's and Intel's host options: 117 before, 0 after). The drivers tried accept them, so nothing crashed, but an invalid module is whatever a driver makes of it. The read now declares the capability, once a module. The translator's identity changes, so an updated install translates its shaders again (the carry pass serves the old translations meanwhile). Built here from the local package cache; tools/xlate_smoke.py's new compute case fails with the translator before the patch and passes with it, and both modules validate. Not played with the new translator. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> (cherry picked from commit 62e5c345a2ec3e2cc70be49214997ff76e691309)
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
"""Smoke test for build/xlate/nx2navi_xlate(.exe): no game files needed.
|
||||
|
||||
Sends one hand-assembled Maxwell fragment shader (writes the constant colour 1.0, 0.5, 0.25, 1.0 to render target 0)
|
||||
through --serve, checks the reply, validates the SPIR-V with spirv-val, then sends a malformed line and checks the
|
||||
service survives and still answers.
|
||||
through --serve, checks the reply, then sends a malformed line and checks the service survives and still answers. A
|
||||
hand-assembled compute shader that loads a texel from a float image and stores it back follows: the translator
|
||||
declares such an image without a format, and its read needs StorageImageReadWithoutFormat. Every module is validated
|
||||
with spirv-val.
|
||||
|
||||
python tools/xlate_smoke.py
|
||||
"""
|
||||
@@ -31,6 +33,8 @@ def mov32i(dest: int, value: float) -> int:
|
||||
|
||||
EXIT = 0xE30000000000000F | PT
|
||||
SCHED = 0x001F8000FC0007E0 # scheduling control word; the decoder skips it
|
||||
RZ = 0xFF
|
||||
IMAGE0 = 0x120 // 4 # first NVN image handle in c[2] (tools/xlate/Program.cs ImgSlot): image slot 0
|
||||
|
||||
|
||||
def fragment_code() -> bytes:
|
||||
@@ -42,6 +46,21 @@ def fragment_code() -> bytes:
|
||||
return struct.pack("<20I", *header) + struct.pack(f"<{len(words)}Q", *words)
|
||||
|
||||
|
||||
SULD_P, SUST_P = 0x1D61, 0x1D65 # opcode bits 51-63 of SULD.P and SUST.P
|
||||
|
||||
|
||||
def surface_p(opcode: int, data: int, coord: int, handle: int) -> int:
|
||||
"""SULD.P / SUST.P 1D RGBA: the data registers from `data` on, coordinate register, image handle (TidB)."""
|
||||
no_pred_out = 7 << 30 if opcode == SULD_P else 0 # SULD's second destination predicate: PT, none written
|
||||
return (opcode << 51) | (handle << 36) | no_pred_out | (0xF << 20) | PT | (coord << 8) | data
|
||||
|
||||
|
||||
def image_read_code() -> bytes:
|
||||
"""Compute code: R0-R3 = image 0 at x 0 (SULD.P), stored back there (SUST.P)."""
|
||||
words = [SCHED, surface_p(SULD_P, 0, RZ, IMAGE0), surface_p(SUST_P, 0, RZ, IMAGE0), EXIT]
|
||||
return struct.pack(f"<{len(words)}Q", *words)
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if not EXE.is_file():
|
||||
print(f"missing {EXE}; run tools/build_xlate.py", file=sys.stderr)
|
||||
@@ -50,27 +69,35 @@ def main() -> int:
|
||||
tmp = Path(tmp)
|
||||
code = tmp / "ps.bin"
|
||||
code.write_bytes(fragment_code())
|
||||
image_code = tmp / "cs.bin"
|
||||
image_code.write_bytes(image_read_code())
|
||||
out = tmp / "out"
|
||||
job = {"key": "const_ps", "stage": "ps", "code": str(code), "debug": False, "fout": {"0": "float"}}
|
||||
image_job = {"key": "image_read_cs", "stage": "cs", "code": str(image_code), "debug": False, "local": [1, 1, 1]}
|
||||
lines = [
|
||||
json.dumps({"job": job, "out": str(out)}),
|
||||
"this is not json",
|
||||
json.dumps({"job": dict(job, key="again"), "out": str(out)}),
|
||||
json.dumps({"job": image_job, "out": str(out)}),
|
||||
]
|
||||
r = subprocess.run([str(EXE), "--serve"], input="\n".join(lines) + "\n", capture_output=True, text=True, timeout=60)
|
||||
replies = r.stdout.splitlines()
|
||||
print("replies:", replies)
|
||||
if len(replies) != 3 or replies[0] != "ok const_ps" or not replies[1].startswith("fail ") or replies[2] != "ok again":
|
||||
if (len(replies) != 4 or replies[0] != "ok const_ps" or not replies[1].startswith("fail ") or replies[2] != "ok again"
|
||||
or replies[3] != "ok image_read_cs"):
|
||||
print("unexpected replies; stderr:", r.stderr, file=sys.stderr)
|
||||
return 1
|
||||
spv = out / "const_ps.spv"
|
||||
data = spv.read_bytes()
|
||||
if len(data) < 20 or struct.unpack("<I", data[:4])[0] != 0x07230203:
|
||||
print("reply is not SPIR-V", file=sys.stderr)
|
||||
return 1
|
||||
v = subprocess.run([str(SPIRV_VAL), "--target-env", "vulkan1.3", str(spv)], capture_output=True, text=True)
|
||||
print(f"spirv-val exit {v.returncode} ({len(data)} bytes) {v.stdout}{v.stderr}")
|
||||
return v.returncode
|
||||
failed = 0
|
||||
for key in ("const_ps", "image_read_cs"):
|
||||
spv = out / f"{key}.spv"
|
||||
data = spv.read_bytes()
|
||||
if len(data) < 20 or struct.unpack("<I", data[:4])[0] != 0x07230203:
|
||||
print(f"{key}: reply is not SPIR-V", file=sys.stderr)
|
||||
return 1
|
||||
v = subprocess.run([str(SPIRV_VAL), "--target-env", "vulkan1.3", str(spv)], capture_output=True, text=True)
|
||||
print(f"{key}: spirv-val exit {v.returncode} ({len(data)} bytes) {v.stdout}{v.stderr}")
|
||||
failed |= v.returncode != 0
|
||||
return int(failed)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user