From a4dd45185d266e28844ac430dd73a998e9d1545c Mon Sep 17 00:00:00 2001 From: d6 Date: Sun, 26 Dec 2021 21:01:22 -0500 Subject: [PATCH] comparisons etc --- math32.tal | 329 ++++++++++++++++++++++++++++++----------------------- tester.py | 51 +++++---- 2 files changed, 214 insertions(+), 166 deletions(-) diff --git a/math32.tal b/math32.tal index 3f4c135..17744e4 100644 --- a/math32.tal +++ b/math32.tal @@ -13,131 +13,19 @@ %TOR { ROT ROT } ( a b c -> c a b ) %TOR2 { ROT2 ROT2 } %POP4 { POP2 POP2 } - -%X { #0000 #0001 } -%Y { #1234 #ffff } -%Z { #fedc #ba98 } +%COMPLEMENT32 { SWP2 #ffff EOR2 SWP2 #ffff EOR2 } +%RESET-POS { #0000 ;pos STA2 #00 ;buf STA } +%EMIT-BYTE { DUP #04 SFT DIGIT #0f AND DIGIT } ( devices ) |10 @Console [ &vector $2 &read $1 &pad $5 &write $1 ] ( program ) |0100 - ;interact .Console/vector DEO2 -BRK + ;test-interact .Console/vector DEO2 BRK -( e.g. #31 #33 -> #13 ) -@parse-byte ( c0 c1 -> x^ ) - ( lower char ) - DUP #3a LTH ,&lo-digit JCN - #57 ,&lo JMP &lo-digit #30 - &lo SUB SWP - - ( higher char )) - DUP #3a LTH ,&hi-digit JCN - #57 ,&hi JMP &hi-digit #30 - &hi SUB #40 SFT ORA -RTN - -@buf $24 -@pos $2 - -@read-byte ( addr* -> x^ ) - LDA2 ;parse-byte JSR2 -RTN - -@read-long ( addr* -> x** ) - DUP2 ,&loc STR2 LDA2 ;parse-byte JSR2 - ,&loc LDR2 #0002 ADD2 LDA2 ;parse-byte JSR2 - ,&loc LDR2 #0004 ADD2 LDA2 ;parse-byte JSR2 - ,&loc LDR2 #0006 ADD2 LDA2 ;parse-byte JSR2 -RTN -[ &loc $2 ] - -%POS++ { ;pos LDA2k INC2 SWP2 STA2 } -%RESET-POS { #0000 ;pos STA2 #00 ;buf STA } - -@interact - .Console/read DEI ( char^ ) - DUP #0a EQU ( char^ char=\n? ) - ,&exec JCN ( char^ ) - ;pos LDA2 ;buf ADD2 STA POS++ BRK - &exec - POP ( ) - ;buf LDA LIT '+ EQU ;test-add32 JCN2 - ;buf LDA LIT '* EQU ;test-mul32 JCN2 - ;buf LDA LIT '- EQU ;test-sub32 JCN2 - ;buf LDA LIT 'L EQU ;test-left-shift JCN2 - ;buf LDA LIT 'R EQU ;test-right-shift JCN2 - ;buf LDA LIT 'B EQU ;test-bitcount32 JCN2 - ;buf LDA LIT '& EQU ;test-and32 JCN2 - ;buf LDA LIT '| EQU ;test-or32 JCN2 - ;buf LDA LIT '^ EQU ;test-xor32 JCN2 - ;buf LDA LIT '~ EQU ;test-complement32 JCN2 - ;buf LDA LIT 'N EQU ;test-negate32 JCN2 - ;buf LDA LIT '= EQU ;test-eq32 JCN2 - ;buf LDA LIT '! EQU ;test-ne32 JCN2 - LIT '? EMIT NEWLINE RESET-POS BRK - -( format: ". xxxxxxxx" ) -%UNARY-32-TEST { - ;buf #0002 ADD2 ;read-long JSR2 - ROT2 JSR2 ;emit-long JSR2 - NEWLINE RESET-POS BRK -} - -( format: ". xxxxxxxx yyyyyyyy" ) -%BINARY-32-TEST { - ;buf #0002 ADD2 ;read-long JSR2 - ROT2 - ;buf #000b ADD2 ;read-long JSR2 - ROT2 JSR2 ;emit-long JSR2 - NEWLINE RESET-POS BRK -} - -@test-add32 ;add32 BINARY-32-TEST -@test-mul32 ;mul32 BINARY-32-TEST -@test-sub32 ;sub32 BINARY-32-TEST - -@test-left-shift - ( format: "+ xxxxxxxx yy" ) - ;buf #0002 ADD2 ;read-long JSR2 - ;buf #000b ADD2 ;read-byte JSR2 - ;left-shift JSR2 ;emit-long JSR2 - NEWLINE RESET-POS BRK - -@test-right-shift - ( format: "+ xxxxxxxx yy" ) - ;buf #0002 ADD2 ;read-long JSR2 - ;buf #000b ADD2 ;read-byte JSR2 - ;right-shift JSR2 ;emit-long JSR2 - NEWLINE RESET-POS BRK - -@test-bitcount32 - ( format: "B xxxxxxxx" ) - ;buf #0002 ADD2 ;read-long JSR2 - ;bitcount32 JSR2 ;emit-byte JSR2 - NEWLINE RESET-POS BRK - -@test-and32 ;and32 BINARY-32-TEST -@test-or32 ;or32 BINARY-32-TEST -@test-xor32 ;xor32 BINARY-32-TEST -@test-complement32 ;complement32 UNARY-32-TEST -@test-negate32 ;negate32 UNARY-32-TEST - -@test-eq32 - ( format: "= xxxxxxxx yyyyyyyy" ) - ;buf #0002 ADD2 ;read-long JSR2 - ;buf #000b ADD2 ;read-long JSR2 - ;eq32 JSR2 ;emit-byte JSR2 - NEWLINE RESET-POS BRK - -@test-ne32 - ( format: "= xxxxxxxx yyyyyyyy" ) - ;buf #0002 ADD2 ;read-long JSR2 - ;buf #000b ADD2 ;read-long JSR2 - ;ne32 JSR2 ;emit-byte JSR2 - NEWLINE RESET-POS BRK +( bitcount: number of bits needed to represent number ) +( equivalent to floor[log2[x]] + 1 ) @bitcount8 ( x^ -> n^ ) #00 SWP ( n x ) @@ -172,6 +60,8 @@ RTN TOR POP2 #10 ADD ( nhi+16 ) RTN +( equality ) + @eq32 ( xhi* xlo* yhi* ylo* -> bool^ ) ROT2 EQU2 #00 TOR2 EQU2 SWP POP AND @@ -190,6 +80,42 @@ RTN ORA2 #0000 NEQ2 RTN +( comparisons ) + +( x < y ) +@lt32 ( x** y** -> bool^ ) + ROT2 SWP2 ( xhi yhi xlo ylo ) + LTH2 ,<-lo JCN ( xhi yhi ) + LTH2 RTN + <-lo + GTH2 #00 EQU RTN + +( x <= y ) +@lteq32 ( x** y** -> bool^ ) + ROT2 SWP2 ( xhi yhi xlo ylo ) + GTH2 ,>-lo JCN ( xhi yhi ) + GTH2 #00 EQU RTN + >-lo + LTH2 RTN + +( x > y ) +@gt32 ( x** y** -> bool^ ) + ROT2 SWP2 ( xhi yhi xlo ylo ) + GTH2 ,>-lo JCN ( xhi yhi ) + GTH2 RTN + >-lo + LTH2 #00 EQU RTN + +( x > y ) +@gteq32 ( x** y** -> bool^ ) + ROT2 SWP2 ( xhi yhi xlo ylo ) + LTH2 ,<-lo JCN ( xhi yhi ) + LTH2 #00 EQU RTN + <-lo + GTH2 RTN + +( bitwise operations ) + @and32 ( xhi* xlo* yhi* ylo* -> xhi|yhi* xlo|ylo* ) ROT2 AND2 TOR2 AND2 SWP2 RTN @@ -202,20 +128,11 @@ RTN ROT2 EOR2 TOR2 EOR2 SWP2 RTN -%COMPLEMENT32 { SWP2 #ffff EOR2 SWP2 #ffff EOR2 } - @complement32 ( x** -> ~x** ) COMPLEMENT32 RTN -@negate32 ( x** -> -x** ) - COMPLEMENT32 - INC2 ( ~xhi -xlo ) - DUP2 #0000 NEQ2 ( ~xhi -xlo non-zero? ) - ,&done JCN ( xlo non-zero => don't inc hi ) - SWP2 INC2 SWP2 ( -xhi -xlo ) - &done -RTN +( bit shifting ) @right-shift ( x** n^ -> x< zhi* zlo* ) ,&y2 STR2 ,&y0 STR2 ( save ylo, yhi ) ,&x2 STR2 ,&x0 STR2 ( save xlo, xhi ) @@ -363,6 +282,15 @@ RTN [ &y0 $1 &y1 $1 &y2 $1 &y3 $1 ] [ &z0 $1 &z1 $1 &z2 $2 ] +@negate32 ( x** -> -x** ) + COMPLEMENT32 + INC2 ( ~xhi -xlo ) + DUP2 #0000 NEQ2 ( ~xhi -xlo non-zero? ) + ,&done JCN ( xlo non-zero => don't inc hi ) + SWP2 INC2 SWP2 ( -xhi -xlo ) + &done +RTN + @sub32 ( x** y** -> z** ) ;negate32 JSR2 ;add32 JSR2 RTN @@ -411,16 +339,16 @@ RTN [ &y0 $2 &y1 $2 ] [ &z0 $2 &z1 $2 ] + @divmod32-by-32 ( x** y** -> q** r** ) ,&div1 STR2 ,&div0 STR2 ( y -> div ) ,&rem1 STR2 ,&rem0 STR2 ( x -> rem ) - #0000 #0000 ,&quo1 STR2 ,&quo0 ( 0 -> quo ) - ,&rem0 LDR2 ,&rem1 LDR2 ;bitcount32 JSR2 ( rembits^ ) - ,&div1 LDR2 ,&div0 LDR2 ;bitcount32 JSR2 ( rembits^ divbits^ ) - SUBk ,&shift STR ( rembits divbits ) - ,&div0 LDR2 ,&div1 LDR2 - - + #0000 ,&quo1 STR2 #0000 ,&quo0 STR2 ( 0 -> quo ) + ,&rem0 LDR2 ,&rem1 LDR2 ;bitcount32 JSR2 ( rbits^ ) + ,&div0 LDR2 ,&div1 LDR2 ;bitcount32 JSR2 ( rbits^ dbits^ ) + SUBk ,&shift STR ( rbits-dbits -> shift ) + ,&div0 LDR2 ,&div1 LDR2 ,&shift LDR ;left-shift JSR2 ( div< ) - SWP2 ( lo* hi* ) - ;emit-short JSR2 - ;emit-short JSR2 +( testing ) + +( parses hex representation e.g. #31 #33 -> #13 ) +@parse-byte ( c0 c1 -> x^ ) + ( lower char ) + DUP #3a LTH ,&lo-digit JCN + #57 ,&lo JMP &lo-digit #30 + &lo SUB SWP + + ( higher char )) + DUP #3a LTH ,&hi-digit JCN + #57 ,&hi JMP &hi-digit #30 + &hi SUB #40 SFT ORA RTN -%EMIT-BYTE { DUP #04 SFT DIGIT #0f AND DIGIT } +@buf $24 ( buffer used by test-interact ) +@pos $2 ( position in buffer used by test-interact ) + +( save character input and execute tests on \n ) +( tests always start with a single character and a space ) +( then additional arguments are passed. ) +@test-interact + .Console/read DEI ( char^ ) + DUP #0a EQU ( char^ char=\n? ) + ,&exec JCN ( char^ ) + ;pos LDA2 ;buf ADD2 STA + ;pos LDA2k INC2 SWP2 STA2 BRK + &exec + POP ( ) + ;buf LDA LIT '+ EQU ;test-add32 JCN2 + ;buf LDA LIT '* EQU ;test-mul32 JCN2 + ;buf LDA LIT '- EQU ;test-sub32 JCN2 + ;buf LDA LIT 'L EQU ;test-left-shift JCN2 + ;buf LDA LIT 'R EQU ;test-right-shift JCN2 + ;buf LDA LIT 'B EQU ;test-bitcount32 JCN2 + ;buf LDA LIT '& EQU ;test-and32 JCN2 + ;buf LDA LIT '| EQU ;test-or32 JCN2 + ;buf LDA LIT '^ EQU ;test-xor32 JCN2 + ;buf LDA LIT '~ EQU ;test-complement32 JCN2 + ;buf LDA LIT 'N EQU ;test-negate32 JCN2 + ;buf LDA LIT '= EQU ;test-eq32 JCN2 + ;buf LDA LIT '! EQU ;test-ne32 JCN2 + ;buf LDA LIT '0 EQU ;test-is-zero32 JCN2 + ;buf LDA LIT 'Z EQU ;test-non-zero32 JCN2 + ;buf LDA LIT '< EQU ;test-lt32 JCN2 + ;buf LDA LIT '> EQU ;test-gt32 JCN2 + ;buf LDA LIT '{ EQU ;test-lteq32 JCN2 + ;buf LDA LIT '} EQU ;test-gteq32 JCN2 + LIT '? EMIT NEWLINE RESET-POS BRK + +@read-byte ( addr* -> x^ ) + LDA2 ;parse-byte JSR2 +RTN + +@read-long ( addr* -> x** ) + DUP2 ,&loc STR2 LDA2 ;parse-byte JSR2 + ,&loc LDR2 #0002 ADD2 LDA2 ;parse-byte JSR2 + ,&loc LDR2 #0004 ADD2 LDA2 ;parse-byte JSR2 + ,&loc LDR2 #0006 ADD2 LDA2 ;parse-byte JSR2 +RTN +[ &loc $2 ] + +( format: ". xxxxxxxx" -> "zzzzzzzz" ) +@unary-32-test + ;buf #0002 ADD2 ;read-long JSR2 + ROT2 JSR2 ;emit-long JSR2 + NEWLINE RESET-POS BRK + +( format: ". xxxxxxxx" -> "zz" ) +@unary-32-8-test + ;buf #0002 ADD2 ;read-long JSR2 + ROT2 JSR2 ;emit-byte JSR2 + NEWLINE RESET-POS BRK + +( format: ". xxxxxxxx yyyyyyyy" -> "zzzzzzzz" ) +@binary-32-test + ;buf #0002 ADD2 ;read-long JSR2 + ROT2 + ;buf #000b ADD2 ;read-long JSR2 + ROT2 JSR2 ;emit-long JSR2 + NEWLINE RESET-POS BRK + +( format: ". xxxxxxxx yy" -> "zzzzzzzz" ) +@binary-32-8-32-test + ;buf #0002 ADD2 ;read-long JSR2 + ROT2 + ;buf #000b ADD2 ;read-byte JSR2 + TOR JSR2 ;emit-long JSR2 + NEWLINE RESET-POS BRK + +( format: ". xxxxxxxx yyyyyyyy" -> "zz" ) +@binary-32-32-8-test + ;buf #0002 ADD2 ;read-long JSR2 + ROT2 + ;buf #000b ADD2 ;read-long JSR2 + ROT2 JSR2 ;emit-byte JSR2 + NEWLINE RESET-POS BRK + +( different test executors ) +@test-add32 ;add32 ;binary-32-test JMP2 +@test-mul32 ;mul32 ;binary-32-test JMP2 +@test-sub32 ;sub32 ;binary-32-test JMP2 +@test-left-shift ;left-shift ;binary-32-8-32-test JMP2 +@test-right-shift ;right-shift ;binary-32-8-32-test JMP2 +@test-bitcount32 ;bitcount32 ;unary-32-8-test JMP2 +@test-and32 ;and32 ;binary-32-test JMP2 +@test-or32 ;or32 ;binary-32-test JMP2 +@test-xor32 ;xor32 ;binary-32-test JMP2 +@test-complement32 ;complement32 ;unary-32-test JMP2 +@test-negate32 ;negate32 ;unary-32-test JMP2 +@test-eq32 ;eq32 ;binary-32-32-8-test JMP2 +@test-ne32 ;ne32 ;binary-32-32-8-test JMP2 +@test-is-zero32 ;is-zero32 ;unary-32-8-test JMP2 +@test-non-zero32 ;non-zero32 ;unary-32-8-test JMP2 +@test-lt32 ;lt32 ;binary-32-32-8-test JMP2 +@test-lteq32 ;lteq32 ;binary-32-32-8-test JMP2 +@test-gt32 ;gt32 ;binary-32-32-8-test JMP2 +@test-gteq32 ;gteq32 ;binary-32-32-8-test JMP2 + +@emit-long ( hi* lo* -> ) + SWP2 + SWP EMIT-BYTE EMIT-BYTE + SWP EMIT-BYTE EMIT-BYTE +RTN @emit-short ( x* -> ) - SWP ( lo^ hi^ ) - EMIT-BYTE EMIT-BYTE + SWP EMIT-BYTE EMIT-BYTE RTN @emit-byte ( x^ -> ) EMIT-BYTE RTN +( convenience for less branching when printing hex ) @digits 30 31 32 33 34 35 36 37 38 39 61 62 63 64 65 66 diff --git a/tester.py b/tester.py index 3355d7c..67d362a 100644 --- a/tester.py +++ b/tester.py @@ -1,8 +1,9 @@ #!/usr/bin/python +from math import floor, log from os import environ -from subprocess import Popen, PIPE from random import randint +from subprocess import Popen, PIPE u3 = {'sz': 1 << 3, 'fmt': b'%02x'} u5 = {'sz': 1 << 5, 'fmt': b'%02x'} @@ -33,48 +34,50 @@ def testcase(p, sym, args, out, f): res[name] = x return res -def test(p, runs, sym, args, out, f): +def test(p, trials, sym, args, out, f): fails = 0 cases = [] maximum = (1 << 32) - 1 - for i in range(0, runs): + for i in range(0, trials): case = testcase(p, sym, args, out, f) if case is not None: fails += 1 cases.append(case) name = sym.decode('utf-8') if fails == 0: - print('%s passed %d runs' % (name, runs)) + print('%s passed %d trials' % (name, trials)) else: - print('%s failed %d/%d runs (%r)' % (name, fails, runs, cases)) + print('%s failed %d/%d trials (%r)' % (name, fails, trials, cases)) def pipe(): cli = environ['HOME'] + '/w/uxn/bin/uxncli' return Popen([cli, 'run.rom'], stdin=PIPE, stdout=PIPE) def bitcount(x): - n = 0 - while x > 0: - n += 1 - x = x >> 1 - return n + return floor(log(x, 2)) + 1 def main(): - runs = 1000 + trials = 1000 p = pipe() - test(p, runs, b'+', [('x', u32), ('y', u32)], u32, lambda x, y: x + y) - test(p, runs, b'-', [('x', u32), ('y', u32)], u32, lambda x, y: x - y) - test(p, runs, b'*', [('x', u32), ('y', u32)], u32, lambda x, y: x * y) - test(p, runs, b'L', [('x', u32), ('y', u5)], u32, lambda x, y: x << y) - test(p, runs, b'R', [('x', u32), ('y', u5)], u32, lambda x, y: x >> y) - test(p, runs, b'B', [('x', u32)], u8, bitcount) - test(p, runs, b'&', [('x', u32), ('y', u32)], u32, lambda x, y: x & y) - test(p, runs, b'|', [('x', u32), ('y', u32)], u32, lambda x, y: x | y) - test(p, runs, b'^', [('x', u32), ('y', u32)], u32, lambda x, y: x ^ y) - test(p, runs, b'~', [('x', u32)], u32, lambda x: ~x) - test(p, runs, b'N', [('x', u32)], u32, lambda x: -x) - test(p, runs, b'=', [('x', u32), ('y', u32)], u8, lambda x, y: int(x == y)) - test(p, runs, b'!', [('x', u32), ('y', u32)], u8, lambda x, y: int(x != y)) + test(p, trials, b'+', [('x', u32), ('y', u32)], u32, lambda x, y: x + y) + test(p, trials, b'-', [('x', u32), ('y', u32)], u32, lambda x, y: x - y) + test(p, trials, b'*', [('x', u32), ('y', u32)], u32, lambda x, y: x * y) + test(p, trials, b'L', [('x', u32), ('y', u5)], u32, lambda x, y: x << y) + test(p, trials, b'R', [('x', u32), ('y', u5)], u32, lambda x, y: x >> y) + test(p, trials, b'B', [('x', u32)], u8, bitcount) + test(p, trials, b'&', [('x', u32), ('y', u32)], u32, lambda x, y: x & y) + test(p, trials, b'|', [('x', u32), ('y', u32)], u32, lambda x, y: x | y) + test(p, trials, b'^', [('x', u32), ('y', u32)], u32, lambda x, y: x ^ y) + test(p, trials, b'~', [('x', u32)], u32, lambda x: ~x) + test(p, trials, b'N', [('x', u32)], u32, lambda x: -x) + test(p, trials, b'=', [('x', u32), ('y', u32)], u8, lambda x, y: int(x == y)) + test(p, trials, b'!', [('x', u32), ('y', u32)], u8, lambda x, y: int(x != y)) + test(p, trials, b'0', [('x', u32)], u8, lambda x: int(x == 0)) + test(p, trials, b'Z', [('x', u32)], u8, lambda x: int(x != 0)) + test(p, trials, b'<', [('x', u32), ('y', u32)], u8, lambda x, y: int(x < y)) + test(p, trials, b'>', [('x', u32), ('y', u32)], u8, lambda x, y: int(x > y)) + test(p, trials, b'{', [('x', u32), ('y', u32)], u8, lambda x, y: int(x <= y)) + test(p, trials, b'}', [('x', u32), ('y', u32)], u8, lambda x, y: int(x >= y)) p.stdin.close() p.stdout.close()