Skip to content

Get full code coverage for relational primitives tests #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pmikkelsen wants to merge 1 commit into
base: main
Choose a base branch
from
+66 −33
Draft

Get full code coverage for relational primitives tests #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 38 additions & 33 deletions tests/_relational.apln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
:If {(⍵<min)∨⍵>max}+⌿1=r
⎕SIGNAL 16 ⍝ NONCE ERROR
:EndIf

⍝ Check if the results from the less_than, equal and greater_than tests match the expected pattern
⍝ for the given primitive. See the tests that use this module for examples.
r←(⊂r)∊ns.patterns
Expand All @@ -74,7 +74,7 @@
:EndIf
∇

∇ {r}←test_relational ns;Chars;Ints;caselist;ct;data;data_bool;data_bool_0;data_bool_0_special;data_bool_1;data_bool_1_special;data_char1;data_char2;data_char4;data_complex;data_float;data_int1;data_int2;data_int4;data_real;data_ref1;data_ref2;data_refs;fr;model;prim;primSymb;quadparams;runVariations;testDesc;testName;x;y
∇ {r}←test_relational ns;Chars;Ints;caselist;ct;data;data_bool;data_bool_0;data_bool_0_special;data_bool_1;data_bool_1_special;data_char1;data_char2;data_char4;data_complex;data_float;data_int1;data_int2;data_int4;data_real;data_ref1;data_ref2;data_refs;fr;model;prim;primSymb;quadparams;runVariations;simdCombination;simdId;testDesc;testName;x;y
r←⍬
model←(ns relational_model)#.iso_defs.ScalarExtensionOperator
prim←ns.primitive
Expand All @@ -84,48 +84,53 @@
Ints←#.random.Ints
Chars←#.random.Chars

:For fr :In #.utils.(fr_dbl fr_decf)
ns.⎕FR←⎕FR←fr
:For ct :In 0 1 10 0.1
ns.(⎕CT ⎕DCT)←(⎕CT ⎕DCT)←ct×#.utils.(ct_default dct_default)
simdId←#.utils.Simd.Category'arithfns'

:For simdCombination :In #.utils.Simd.AllCombinations simdId
:For fr :In #.utils.(fr_dbl fr_decf)
ns.⎕FR←⎕FR←fr
:For ct :In 0 1 10 0.1
ns.(⎕CT ⎕DCT)←(⎕CT ⎕DCT)←ct×#.utils.(ct_default dct_default)

quadparams←⎕CT ⎕DCT ⎕FR ⎕IO ⎕DIV
testDesc←'with (⎕FR ⎕CT ⎕DCT)≡(',(⍕⎕FR ⎕CT ⎕DCT),')'
quadparams←⎕CT ⎕DCT ⎕FR ⎕IO ⎕DIV
testDesc←'with (⎕FR ⎕CT ⎕DCT)≡(',(⍕⎕FR ⎕CT ⎕DCT),')'

data_int1←100 Ints 8
data_int2←100 Ints 16
data_int4←100 Ints 32
data_char1←100 Chars 8
:If ~#.utils.isClassic
data_char2←100 Chars 16
data_char4←100 Chars 32
:EndIf
data_int1←100 Ints 8
data_int2←100 Ints 16
data_int4←100 Ints 32
data_char1←100 Chars 8
:If ~#.utils.isClassic
data_char2←100 Chars 16
data_char4←100 Chars 32
:EndIf

data_real←?100⍴0
data_real←?100⍴0

data_complex←(?100⍴0){⍺+0J1×⍵}?100⍴0
data_complex←(?100⍴0){⍺+0J1×⍵}?100⍴0

data_ref1←#
data_ref2←⎕DMX
data_refs←⎕NS¨⍬ ⍬ ⍬
data_ref1←#
data_ref2←⎕DMX
data_refs←⎕NS¨⍬ ⍬ ⍬

data_bool←0 1
data_bool_1←1
data_bool_0←0
data_bool_1_special←=⌿0 0
data_bool_0_special←≠⌿0 0
data_bool←0 1
data_bool_1←1
data_bool_0←0
data_bool_1_special←=⌿0 0
data_bool_0_special←≠⌿0 0

caselist←⎕NL ¯2
caselist←caselist⌿⍨{'data_'⊃⍤⍷⍵}¨caselist
caselist←⎕NL ¯2
caselist←caselist⌿⍨{'data_'⊃⍤⍷⍵}¨caselist

:For x :In caselist
x←⎕VGET x
:For y :In caselist
y←⎕VGET y
r,←testName testDesc quadparams runVariations x y
:For x :In caselist
x←⎕VGET x
:For y :In caselist
y←⎕VGET y
r,←testName testDesc quadparams runVariations x y
:EndFor
:EndFor
:EndFor
:EndFor
:EndFor
#.utils.Simd.Reset
∇
:EndNamespace
28 changes: 28 additions & 0 deletions utils.apln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
⎕IO←0
⍺⍴0 1~⍨(2*⍵-1)-⍨?⍺⍴2*⍵
}
subsets←{⌿∘⍵¨↓⌽⍉2⊥⍣¯1⊢¯1+⍳2*≢⍵} ⍝ (From APLCart) Powerset: All subsets of ⍵, including the empty set (0⌿⍵) and ⍵ itself

⍝ Interpreter version information
isClassic←82=⎕dr''
Expand Down Expand Up @@ -55,4 +56,31 @@
:EndSelect

∇

:Namespace Simd
⎕IO←1
∇ r←Category c;m
m←(⊂c)≡¨⊃21165⌶0
:If 1≠+⌿m
('No such SIMD category: ',c)⎕SIGNAL 11
:EndIf
r←⍸m
∇

∇ which Enable id;m
m←6⊃21165⌶0
m[id;]←0 ⍝ Disable all in the category
m[id;which]←1 ⍝ Enable those we want
m(21165⌶)1
∇

∇ Reset;m
m←5⊃21165⌶0 ⍝ Reset the enabled optimisations to the defaults
m(21165⌶)1
∇

∇ r←AllCombinations id;all
r←##.subsets⍸,(5⊃21165⌶0)[id;]
∇
:EndNamespace
:EndNamespace