From c1539b0319ef6545768cfc75d6400239b396bd63 Mon Sep 17 00:00:00 2001 From: George Hotz <72895+geohot@users.noreply.github.com> Date: Tue, 22 Apr 2025 20:12:05 +0100 Subject: [PATCH] putting add first orders loads as expected (#9991) --- test/unit/test_simplify_valid_idx.py | 2 +- tinygrad/ops.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/test_simplify_valid_idx.py b/test/unit/test_simplify_valid_idx.py index b13f9d87f4..163a1b34b1 100644 --- a/test/unit/test_simplify_valid_idx.py +++ b/test/unit/test_simplify_valid_idx.py @@ -301,7 +301,7 @@ class TestImageSimplification(unittest.TestCase): self.check(load, "((((idx2*2)+ridx0)<11)&((((idx1*8)+ridx1)<3)!=True))", "(((idx0+((idx1*512)+(ridx1*64)))+832)%1024)", - "(((((idx1+((ridx1+5)//8))+1)//2)+((idx2*2)+ridx0))+-4)") + "((((idx2*2)+ridx0)+(((idx1+((ridx1+5)//8))+1)//2))+-4)") def test_simplify1(self): # idx has the form (A % m, A // m + k) and valid has (c0 < A) and (A < c1) diff --git a/tinygrad/ops.py b/tinygrad/ops.py index 767e83025a..3867868e09 100644 --- a/tinygrad/ops.py +++ b/tinygrad/ops.py @@ -129,7 +129,7 @@ class Ops(FastEnum): WMMA = auto() # BinaryOps - MUL = auto(); SHL = auto(); SHR = auto(); IDIV = auto(); ADD = auto(); MAX = auto(); MOD = auto(); CMPLT = auto(); CMPNE = auto() # noqa: E702 + ADD = auto(); MUL = auto(); SHL = auto(); SHR = auto(); IDIV = auto(); MAX = auto(); MOD = auto(); CMPLT = auto(); CMPNE = auto() # noqa: E702 XOR = auto(); OR = auto(); AND = auto(); THREEFRY = auto(); SUB = auto(); FDIV = auto(); POW = auto() # noqa: E702 # TernaryOps