Merge branch 'master' of jsoftware.com:jsource

Author: HenryHRich

jsrc/cip.c

@@ -1347,7 +1347,7 @@ finrle: ;
     // ngoodperma is the number of values in perma inherited from earlier blocks
 
     UI permx=0; C perm=0xE4;  // index of perm we are using, and that perm
-    C static perms8[25] = {0xE4,0xB4,0xD8,0x78,0x9C,0x6C,0xE1,0xB1,0xC9,0x39,0x8D,0x2D,0xD2,0x72,0xC6,0x36,0x4E,0x1E,0x93,0x63,0x87,0x27,0x4B,0x1B,~0x1B};   // perms in order of reversed bitpos, i. e. 3 2 1 0 first
+    static C perms8[25] = {0xE4,0xB4,0xD8,0x78,0x9C,0x6C,0xE1,0xB1,0xC9,0x39,0x8D,0x2D,0xD2,0x72,0xC6,0x36,0x4E,0x1E,0x93,0x63,0x87,0x27,0x4B,0x1B,~0x1B};   // perms in order of reversed bitpos, i. e. 3 2 1 0 first
     I bestnperma=ngoodperma; C bestperm=perm;  // best incomplete value so far
 
     // loop till we find a valid permutation

script/testga.ijs

@@ -15,8 +15,8 @@ ECHOFILENAME=: 1   NB. echo file name
 stdout LF ,~ 9!:14''
 
 ddall=: ddall -. blacklist=: blacklist, ('OpenBSD'-:UNAME)#(<testpath),each <'gstack.ijs' NB. temporarily disable
-ddall=: ddall -. blacklist=: blacklist, ('FreeBSD'-:UNAME)#(<testpath),each 'gtdot.ijs';'gtdot1.ijs';'gtdot2.ijs';'gtdot3.ijs';'g13x.ijs';'g7x.ijs' NB. temporarily disable
-ddall=: ~. ddall ,~ (IF64*.(<UNAME)e.'Win';'Darwin')#(<testpath),each <'gcip1.ijs'
+ddall=: ddall -. blacklist=: blacklist, ('OpenBSD'-:UNAME)#(<testpath),each 'gtdot.ijs';'gtdot3.ijs';'gtdot4.ijs' NB. temporarily disable
+ddall=: ~. ddall ,~ (IF64*.(<UNAME)e.<'Win')#(<testpath),each <'gcip1.ijs'
 ddall=: ~. ddall ,~ ((<UNAME)e.'Win';'Darwin')#(<testpath),each <'glapack.ijs'
 
 NB. smoke test

test/gtdot3.ijs

@@ -45,7 +45,7 @@ assert. remote_stuff=3
 )
 
 f =: 3 : 0
-chk=. ('FreeBSD'-:UNAME)
+granularity=. 2e_13
 try.
 while. 2 > 1 T. '' do. 0 T. '' end.  NB. make sure we have 2 worker threads
 catch.
@@ -57,9 +57,9 @@ assert. 2 <: 1 T. ''
 NB. verify that tasks go to different threads if possible.  We can ensure this only for as many threads as there are cores
 setth nwthreads=. 1 >. <: 0 { 8 T. ''  NB. one worker thread per core, -1
 wthr nwthreads
-assert. GITHUBCI +. (>: i. nwthreads) *./@e. aaa__   =: > (3&T.@'')@(6!:3) t.'' "(0)  (0.1 #~ <:nwthreads), 0.6
+assert. (>: i. nwthreads) *./@e. aaa__   =: > (3&T.@'')@(6!:3) t.'' "(0)  (0.1 #~ <:nwthreads), 0.6
 wthr nwthreads
-assert. GITHUBCI +. (>: i. nwthreads) *./@e. > (3&T.@'')@(6!:3) t.'' "(0)  (0.6 #~ <:nwthreads), 0.1
+assert. (>: i. nwthreads) *./@e. > (3&T.@'')@(6!:3) t.'' "(0)  (0.6 #~ <:nwthreads), 0.1
 wthr nwthreads
 assert. (ccc__   =: ((<_1000) #~ <: nwthreads),(>: i. nwthreads);_1001) e.~&> bbb__   =: 4 T. aaa__   =: (3&T.@'')@(6!:3) t.'' "(0) (0.3 #~ <: nwthreads), 2 1  NB. last thread should run in master; earlier ones complete first
 wthr nwthreads
@@ -71,38 +71,30 @@ pyx =. 6!:3 t. ''"0 N # 1.0  NB. fill up with delaying threads
 NB. Verify forcetask arg
 t0 =. 6!:1''
 assert. 1. = >pyx
-techo^:chk 'gtdot3 a13'
 NB. Verify forcetask arg
 NB. assert. (t0 + 0.5) < 6!:1''  [ 'a1' NB. master should not wait
-techo^:chk 'gtdot3 a13a'
 wthr nwthreads
-techo^:chk 'gtdot3 a13b'
 pyx =. 6!:3 t. ''"0 (>:N) # 1.0  NB. fill up with delaying threads
-techo^:chk 'gtdot3 a13c'
 t0 =. 6!:1''
 assert. 1. = >pyx
 NB. assert. (t0 + 0.5) > 6!:1''  [ 'a2' NB. master should wait
 wthr nwthreads
 pyx =. 6!:3 t. 'worker'"0 (>:N) # 1.0  NB. fill up with delaying threads
-techo^:chk 'gtdot3 a13d'
 t0 =. 6!:1''
 assert. 1. = >pyx
 NB. assert. (t0 + 0.5) < 6!:1''  [ 'a3' NB. master should not wait
 wthr nwthreads
 pyx =. 6!:3 t. (<'worker') "0 (>:N) # 1.0  NB. fill up with delaying threads
-techo^:chk 'gtdot3 a13e'
 t0 =. 6!:1''
 assert. 1. = >pyx
 NB. assert. (t0 + 0.5) < 6!:1''  [ 'a4' NB. master should not wait
 wthr nwthreads
 pyx =. 6!:3 t. (<'worker';1) "0 (>:N) # 1.0  NB. fill up with delaying threads
-techo^:chk 'gtdot3 a13f'
 t0 =. 6!:1''
 assert. 1. = >pyx
 NB. assert. (t0 + 0.5) < 6!:1''  [ 'a5' NB. master should not wait
 wthr nwthreads
 pyx =. 6!:3 t. (<'worker';0) "0 (>:N) # 1.0  NB. fill up with delaying threads
-techo^:chk 'gtdot3 a13g'
 t0 =. 6!:1''
 1. = >pyx
 NB. assert. (t0 + 0.5) > 6!:1''  [ 'a6' NB. master should wait
@@ -122,22 +114,17 @@ mtx =. 10 T. 0
 assert. 0 = 11 T. mtx
 'domain error' -: 11 T. etx >:&.> mtx
 mtx =. 10 T. 0
-techo^:chk 'gtdot3 a32'
 tod =. 6!:1''
-techo^:chk 'gtdot3 a32a'
 assert. 0 = >{{11 T. y}}t.''mtx  NB. boxed mtx OK
-techo^:chk 'gtdot3 a32b'
 NB. the following line hang on freebsd
 assert. 1 = 11 T. mtx;2.0
-techo^:chk 'gtdot3 a32c'
-assert. GITHUBCI +. (2.3 > dly) *. 2 <: dly =. tod-~6!:1''  NB. verify delay
-techo^:chk 'gtdot3 a32d'
+assert. (2.3 > dly) *. (2-granularity) <: dly =. tod-~6!:1''  NB. verify delay
 tod =. 6!:1''
 assert. 1 = 11 T. mtx;0.1
-assert. GITHUBCI +. (0.3 > dly) *. 0.1 <: dly =. tod-~6!:1''  NB. verify delay
+assert. (0.3 > dly) *. (0.1-granularity) <: dly =. tod-~6!:1''  NB. verify delay
 tod =. 6!:1''
 assert. 1 = 11 T. mtx;0
-assert. GITHUBCI +. (0.3 > dly) *. 0 <: dly =. tod-~6!:1''  NB. verify no delay
+assert. (0.3 > dly) *. 0 <: dly =. tod-~6!:1''  NB. verify no delay
 mtx=.10 T. 1  NB. recursive
 assert. 0 = 11 T. mtx
 assert. 0 = 11 T. mtx  NB. lock count=2

test/gtdot4.ijs

@@ -14,23 +14,24 @@ NB. Create 1 thread in pool 1; then verify that jobs in pool 1 are faster than t
 1: 0 T. 1
 1 -: 2 { 2 T. 1  NB. can't rely on waiters: terminating threads may still be waiting, or not started
 0 -: 2 { 2 T. 0
+granularity=: 2e_13
 stime =: 6!:1''
 1 = > 6!:3 t. 0"0 ] 6 # 1
-GITHUBCI +. 5 < stime -~ 6!:1''
+(5-granularity) < stime -~ 6!:1''
 stime =: 6!:1''
 1 = > 6!:3 t. 1"0 ] 6 # 1
-GITHUBCI +. 5 > stime -~ 6!:1''
+(5-granularity) > stime -~ 6!:1''
 delth''  NB. clear all threadpools
 0 -: 2 { 2 T. 1
 0 -: 2 { 2 T. 0
 stime =: 6!:1''
 1 = > 6!:3 t. 0"0 ] 6 # 1
-GITHUBCI +. 5 < stime -~ 6!:1''
+(5-granularity) < stime -~ 6!:1''
 stime =: 6!:1''
 1 = > 6!:3 t. 1"0 ] 6 # 1
-GITHUBCI +. 5 < stime -~ 6!:1''
+(5-granularity) < stime -~ 6!:1''
 
-4!:55 ;:'delth stime'
+4!:55 ;:'delth granularity stime'
 
 epilog''
 

test/tsu.ijs

@@ -46,17 +46,15 @@ EMPTY
 NB. black list
 NB. gmbx.ijs is not an independent test
 NB. gfft and glapack - run separately with additional addons
-blacklist=: ((<testpath),each 'gmbx.ijs';'gfft.ijs';'glapack.ijs';'gcip1.ijs'),testfiles 'gmbx'  NB. mapped boxed arrays no longer supported
+blacklist=: ((<testpath),each 'gmbx.ijs';'gfft.ijs';'glapack.ijs'),testfiles 'gmbx'  NB. mapped boxed arrays no longer supported
+blacklist=: blacklist, (-. (<UNAME)e.<'Darwin')#(<testpath),each <'gcip1.ijs'
 blacklist=: blacklist, (IFRASPI<(IF64<UNAME-:'Linux')+.(IFWIN>IF64)+.IFIOS+.(UNAME-:'Wasm'))#(<testpath),each <'gregex.ijs' NB. require libjpcre2 binary
 blacklist=: blacklist, (-.IF64)#(<testpath),each <'g6x14.ijs' NB. require 64-bit
 blacklist=: blacklist, (1=1 { 8 T. '')#(<testpath),each 'gtdot.ijs';'gtdot1.ijs';'gtdot2.ijs';'gtdot3.ijs';'gtdot4.ijs' NB. require multithreading
 blacklist=: blacklist, (-.15!:23'')#(<testpath),each 'g15x.ijs';'g7x5.ijs';'gdll.ijs';'gdll_df.ijs';'gmmf.ijs';'gmmf1s.ijs';'gmmf1u.ijs';'gmmf1w.ijs'  NB. 15!:0 unavailable
 blacklist=: blacklist, ('Wasm'-:UNAME)#(<testpath),each <'gstack.ijs'  NB. crash
 blacklist=: blacklist, (IFQT*.'Wasm'-:UNAME)#(<testpath),each 'g331ps.ijs';'gsp422.ijs';'gsp432.ijs'  NB. crash
 blacklist=: blacklist, IFIOS#(<testpath),each <'gipht.ijs'  NB. crash if included in the whole suite, but ok if running alone
-NB. temp workaround
-blacklist=: blacklist, (UNAME-:'OpenBSD')#(<testpath),each <'gtdot.ijs'
-blacklist=: blacklist, (UNAME-:'FreeBSD')#(<testpath),each 'gsp.ijs';'gsp111.ijs';'gss.ijs'
 
 blacklist=: ~.blacklist
 ddall    =: blacklist -.~ testfiles 'g'