diff --git a/src/builtins/grade.h b/src/builtins/grade.h index d0e6a3d4..698e1fb6 100644 --- a/src/builtins/grade.h +++ b/src/builtins/grade.h @@ -1,4 +1,11 @@ #define GRADE_CAT(N) CAT(GRADE_UD(gradeUp,gradeDown),N) +#define GRADE_NEG GRADE_UD(,-) + +// Timsort +#define SORT_CMP(W, X) GRADE_NEG compare(W, X) +#define SORT_NAME GRADE_UD(bA,bD) +#define SORT_TYPE B +#include "sortTemplate.h" #define SORT_CMP(W, X) GRADE_NEG compare((W).k, (X).k) #define SORT_NAME GRADE_CAT(BP) @@ -10,6 +17,178 @@ #define SORT_TYPE I32I32p #include "sortTemplate.h" + +#define LT GRADE_UD(<,>) +#define FOR(I,MAX) GRADE_UD(for (usz I=0; Ie; j--) { i+=c0[j]; rp[i]--; } \ + ) \ + for (usz i=1; i>=), PRE_UD(K,>>,<<=)) + +#define CHOOSE_SG_SORT(S,G) S +#define CHOOSE_SG_GRADE(S,G) G + +#define RADIX_SORT_i8(T, TYP) \ + TALLOC(T, c0, 256); T *c0o=c0+128; \ + for (usz j=0; j<256; j++) c0[j]=0; \ + for (usz i=0; i>8)]++; } \ + RADIX_SUM_2_##T; \ + i16 *r0 = (i16*)(c0+2*256); \ + CHOOSE_SG_##TYP( \ + for (usz i=0; i>8)]++]=v; } \ + , \ + I *g0 = (i32*)(r0+n); \ + for (usz i=0; i>8)]++]=g0[i]; } \ + ) \ + TFREE(alloc) +#define RADIX_SUM_2_u8 u64 s0=0, s1=0; FOR(j,256/8) { PRE64(0); PRE64(1); } +#define RADIX_SUM_2(T) T s0=0, s1=0; FOR(j,256) { PRE(T,0); PRE(T,1); } +#define RADIX_SUM_2_usz RADIX_SUM_2(usz) +#define RADIX_SUM_2_u32 RADIX_SUM_2(u32) + +#define RADIX_SORT_i32(T, TYP, I) \ + TALLOC(u8, alloc, 4*256*sizeof(T) + n*(4 + CHOOSE_SG_##TYP(0,4+sizeof(I)))); \ + T *c0=(T*)alloc, *c1=c0+256, *c2=c1+256, *c3=c2+256, *c3o=c3+128; \ + for (usz j=0; j<4*256; j++) c0[j]=0; \ + for (usz i=0; i> 8)]++; \ + c2 [(u8)(v>>16)]++; c3o[(i8)(v>>24)]++; } \ + RADIX_SUM_4_##T; \ + i32 *r0 = (i32*)(c0+4*256); \ + CHOOSE_SG_##TYP( \ + for (usz i=0; i> 8)]++; rp[c]=v; } \ + for (usz i=0; i>16)]++; r0[c]=v; } \ + for (usz i=0; i>24)]++; rp[c]=v; } \ + , \ + i32 *r1 = r0+n; I *g0 = (i32*)(r1+n); \ + for (usz i=0; i> 8)]++; r1[c]=v; rp[c]=g0[i]; } \ + for (usz i=0; i>16)]++; r0[c]=v; g0[c]=rp[i]; } \ + for (usz i=0; i>24)]++; rp[c]=g0[i]; } \ + ) \ + TFREE(alloc) +#define RADIX_SUM_4_u8 u64 s0=0, s1=0, s2=0, s3=0; FOR(j, 256/8) { PRE64(0); PRE64(1); PRE64(2); PRE64(3); } +#define RADIX_SUM_4(T) T s0=0, s1=0, s2=0, s3=0; FOR(j, 256) { PRE(u32,0); PRE(u32,1); PRE(u32,2); PRE(u32,3); } +#define RADIX_SUM_4_usz RADIX_SUM_4(usz) +#define RADIX_SUM_4_u32 RADIX_SUM_4(u32) + +#define SORT_C1 CAT(GRADE_UD(and,or),c1) +B SORT_C1(B t, B x) { + if (isAtm(x) || RNK(x)==0) thrM(GRADE_UD("∧","∨")": Argument cannot have rank 0"); + if (RNK(x)!=1) return bqn_merge(SORT_C1(t, toCells(x))); + usz n = IA(x); + if (n <= 1) return x; + u8 xe = TI(x,elType); + B r; + if (xe==el_bit) { + u64* xp = bitarr_ptr(x); + u64* rp; r = m_bitarrv(&rp, n); + usz sum = bit_sum(xp, n); + u64 n0 = GRADE_UD(n-sum, sum); + u64 ones = -1ull; + u64 v0 = GRADE_UD(0, ones); + usz i=0, e=(n+63)/64; + for (; i1) x = toCells(x); @@ -29,22 +208,14 @@ B GRADE_CAT(c1)(B t, B x) { else rp[r0++] = i; } decG(x); return r; - } else if (xe==el_i8) { - i8* xp = i8any_ptr(x); - i32 min=-128, range=256; - TALLOC(usz, tmp, range+1); - for (i64 i = 0; i < range+1; i++) tmp[i] = 0; - GRADE_UD( // i8 range-based - for (usz i = 0; i < ia; i++) (tmp-min+1)[xp[i]]++; - for (i64 i = 1; i < range; i++) tmp[i]+= tmp[i-1]; - for (usz i = 0; i < ia; i++) rp[(tmp-min)[xp[i]]++] = i; - , - for (usz i = 0; i < ia; i++) (tmp-min)[xp[i]]++; - for (i64 i = range-2; i >= 0; i--) tmp[i]+= tmp[i+1]; - for (usz i = 0; i < ia; i++) rp[(tmp-min+1)[xp[i]]++] = i; - ) - TFREE(tmp); decG(x); - return r; + } else if (xe==el_i8 && ia>8) { + i8* xp = i8any_ptr(x); usz n=ia; + RADIX_SORT_i8(usz, GRADE); + decG(x); return r; + } else if (xe==el_i16 && ia>16) { + i16* xp = i16any_ptr(x); usz n = ia; + RADIX_SORT_i16(usz, GRADE, i32); + decG(x); return r; } if (xe==el_i32 || xe==el_c32) { // safe to use the same comparison for i32 & c32 as c32 is 0≤x≤1114111 i32* xp = tyany_ptr(x); @@ -70,6 +241,11 @@ B GRADE_CAT(c1)(B t, B x) { TFREE(tmp); decG(x); return r; } + if (ia > 40) { + usz n=ia; + RADIX_SORT_i32(usz, GRADE, i32); + decG(x); return r; + } TALLOC(I32I32p, tmp, ia); for (usz i = 0; i < ia; i++) { @@ -82,7 +258,7 @@ B GRADE_CAT(c1)(B t, B x) { return r; } - SLOW1(GRADE_UD("⍋","⍒")"𝕩", x); + SLOW1(GRADE_CHR"𝕩", x); TALLOC(BI32p, tmp, ia); SGetU(x) for (usz i = 0; i < ia; i++) { @@ -94,6 +270,8 @@ B GRADE_CAT(c1)(B t, B x) { TFREE(tmp); decG(x); return r; } + + B GRADE_CAT(c2)(B t, B w, B x) { if (isAtm(w) || RNK(w)==0) thrM(GRADE_CHR": 𝕨 must have rank≥1"); if (isAtm(x)) x = m_atomUnit(x); @@ -128,14 +306,14 @@ B GRADE_CAT(c2)(B t, B w, B x) { usz s = 0, e = wia+1; while (e-s > 1) { usz m = (s+(i64)e)/2; - if (c GRADE_UD(<,>) wi[m-1]) e = m; + if (c LT wi[m-1]) e = m; else s = m; } rp[i] = s; } } else { SGetU(x) - SLOW2("𝕨"GRADE_UD("⍋","⍒")"𝕩", w, x); + SLOW2("𝕨"GRADE_CHR"𝕩", w, x); B* wp = arr_bptr(w); if (wp==NULL) { HArr* a = toHArr(w); @@ -152,7 +330,7 @@ B GRADE_CAT(c2)(B t, B w, B x) { usz s = 0, e = wia+1; while (e-s > 1) { usz m = (s+e) / 2; - if (compare(c, wp[m-1]) GRADE_UD(<,>) 0) e = m; + if (compare(c, wp[m-1]) LT 0) e = m; else s = m; } rp[i] = s; @@ -161,7 +339,28 @@ B GRADE_CAT(c2)(B t, B w, B x) { decG(w);decG(x); return r; } -#undef GRADE_CAT #undef GRADE_CHR + +#undef LT +#undef FOR +#undef PRE +#undef PRE_UD +#undef PRE64 +#undef CHOOSE_SG_SORT +#undef CHOOSE_SG_GRADE +#undef RADIX_SORT_i8 +#undef RADIX_SUM_1_u8 +#undef RADIX_SUM_1_usz +#undef RADIX_SORT_i16 +#undef RADIX_SUM_2_u8 +#undef RADIX_SUM_2 +#undef RADIX_SUM_2_usz +#undef RADIX_SUM_2_u32 +#undef RADIX_SORT_i32 +#undef RADIX_SUM_4_u8 +#undef RADIX_SUM_4 +#undef RADIX_SUM_4_usz +#undef RADIX_SUM_4_u32 +#undef GRADE_CAT #undef GRADE_NEG #undef GRADE_UD diff --git a/src/builtins/sort.c b/src/builtins/sort.c index b5b17ca5..2371dad7 100644 --- a/src/builtins/sort.c +++ b/src/builtins/sort.c @@ -1,7 +1,7 @@ #include "../core.h" #include "../utils/talloc.h" - +// Defines Sort, Grade, and Bins #define CAT0(A,B) A##_##B #define CAT(A,B) CAT0(A,B) @@ -9,77 +9,6 @@ typedef struct BI32p { B k; i32 v; } BI32p; typedef struct I32I32p { i32 k; i32 v; } I32I32p; #define GRADE_UD(U,D) U -#define GRADE_NEG -#define GRADE_CHR "⍋" #include "grade.h" #define GRADE_UD(U,D) D -#define GRADE_NEG - -#define GRADE_CHR "⍒" #include "grade.h" - -#define SORT_CMP(W, X) compare(W, X) -#define SORT_NAME bA -#define SORT_TYPE B -#include "sortTemplate.h" - -#define SORT_CMP(W, X) ((W) - (i64)(X)) -#define SORT_NAME iA -#define SORT_TYPE i32 -#include "sortTemplate.h" - -B and_c1(B t, B x) { - if (isAtm(x) || RNK(x)==0) thrM("∧: Argument cannot have rank 0"); - if (RNK(x)!=1) return bqn_merge(and_c1(t, toCells(x))); - usz xia = IA(x); - u8 xe = TI(x,elType); - if (xe<=el_i32) { - if (xe!=el_i32) x = taga(cpyI32Arr(x)); - i32* xp = i32any_ptr(x); - i32* rp; B r = m_i32arrv(&rp, xia); - memcpy(rp, xp, xia*4); - iA_tim_sort(rp, xia); - decG(x); - return FL_SET(r, fl_asc); - } - B xf = getFillQ(x); - HArr_p r = m_harrUv(xia); - SGet(x) - for (usz i = 0; i < xia; i++) r.a[i] = Get(x,i); - bA_tim_sort(r.a, xia); - decG(x); - return FL_SET(withFill(r.b,xf), fl_asc); -} - - -#define SORT_CMP(W, X) compare(X, W) -#define SORT_NAME bD -#define SORT_TYPE B -#include "sortTemplate.h" - -#define SORT_CMP(W, X) ((X) - (i64)(W)) -#define SORT_NAME iD -#define SORT_TYPE i32 -#include "sortTemplate.h" - -B or_c1(B t, B x) { - if (isAtm(x) || RNK(x)==0) thrM("∨: Argument cannot have rank 0"); - if (RNK(x)!=1) return bqn_merge(or_c1(t, toCells(x))); - usz xia = IA(x); - u8 xe = TI(x,elType); - if (xe<=el_i32) { - if (xe!=el_i32) x = taga(cpyI32Arr(x)); - i32* xp = i32any_ptr(x); - i32* rp; B r = m_i32arrv(&rp, xia); - memcpy(rp, xp, xia*4); - iD_tim_sort(rp, xia); - decG(x); - return FL_SET(r, fl_dsc); - } - B xf = getFillQ(x); - HArr_p r = m_harrUv(xia); - SGet(x) - for (usz i = 0; i < xia; i++) r.a[i] = Get(x,i); - bD_tim_sort(r.a, xia); - decG(x); - return FL_SET(withFill(r.b,xf), fl_dsc); -}