From 60b1b908c61fa9833c4f042da156e266ad980eaf Mon Sep 17 00:00:00 2001 From: qazal <77887910+Qazalin@users.noreply.github.com> Date: Fri, 13 Mar 2026 15:28:24 +0200 Subject: [PATCH] sqtt: CDNA layout header packet is the same size (#15255) --- test/amd/test_sqtt_examples.py | 5 ++--- tinygrad/renderer/amd/sqtt.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/amd/test_sqtt_examples.py b/test/amd/test_sqtt_examples.py index dfbf36c29d..13484070b8 100644 --- a/test/amd/test_sqtt_examples.py +++ b/test/amd/test_sqtt_examples.py @@ -10,7 +10,7 @@ from tinygrad.runtime.autogen.amd.rdna3.ins import SOPP from tinygrad.runtime.autogen.amd.rdna3.enum import SOPPOp from tinygrad.renderer.amd.sqtt import (decode, LAYOUT_HEADER, WAVESTART, WAVESTART_RDNA4, WAVEEND, INST, INST_RDNA4, VALUINST, IMMEDIATE, IMMEDIATE_MASK, PACKET_TYPES_RDNA3, PACKET_TYPES_RDNA4, PACKET_TYPES_CDNA, CDNA_WAVESTART, - InstOp, InstOpRDNA4, print_packets, CDNA_WAVEEND, CDNA_TIMESTAMP) + InstOp, InstOpRDNA4, print_packets, CDNA_WAVEEND) from test.amd.helpers import TARGET_TO_ARCH import tinygrad @@ -122,8 +122,7 @@ class SQTTExamplesTestBase(unittest.TestCase): print(f"\n=== {name} event {i} ===") print_packets(packets) self.assertGreater(len(packets), 0, f"no packets decoded from {name} event {i}") - first_pkt = CDNA_TIMESTAMP if self.target.startswith("gfx9") else LAYOUT_HEADER - self.assertIsInstance(packets[0], first_pkt, f"first packet should be {first_pkt.__name__} in {name}") + self.assertIsInstance(packets[0], LAYOUT_HEADER, f"first packet should be LAYOUT_HEADER in {name}") def test_packet_types_valid(self): all_classes = set(PACKET_TYPES_RDNA3.values()) | set(PACKET_TYPES_RDNA4.values()) | set(PACKET_TYPES_CDNA.values()) diff --git a/tinygrad/renderer/amd/sqtt.py b/tinygrad/renderer/amd/sqtt.py index f2eca5d6e3..9c0107e154 100644 --- a/tinygrad/renderer/amd/sqtt.py +++ b/tinygrad/renderer/amd/sqtt.py @@ -519,7 +519,7 @@ class CDNA_REG_CS_PRIV(PacketType): PACKET_TYPES_CDNA: dict[int, type[PacketType]] = { 0: CDNA_MISC, 1: CDNA_TIMESTAMP, 2: CDNA_REG, 3: CDNA_WAVESTART, 4: CDNA_WAVEALLOC, 5: CDNA_REG_CS, 6: CDNA_WAVEEND, 7: CDNA_EVENT, 8: CDNA_EVENT_CS, 9: CDNA_EVENT_GFX1, 10: CDNA_INST, 11: CDNA_INST_PC, 12: CDNA_USERDATA, - 13: CDNA_ISSUE, 14: CDNA_PERF, 15: CDNA_REG_CS_PRIV, + 13: CDNA_ISSUE, 14: CDNA_PERF, 15: CDNA_REG_CS_PRIV, 16: LAYOUT_HEADER, } # ═══════════════════════════════════════════════════════════════════════════════