Merge pull request #58 from mlochbaum/bitgroup
Better handling for boolean Group arguments
This commit is contained in:
commit
e2193a18bf
@ -1,16 +1,36 @@
|
||||
// Group and Group Indices (⊔)
|
||||
|
||||
// Group Indices: calls 𝕩⊔↕𝕩 for rank-1 flat 𝕩, otherwise self-hosted
|
||||
|
||||
// Group: native code for rank-1 𝕨 only, optimizations for integers
|
||||
// SHOULD squeeze 𝕨
|
||||
// All statistics computed in the initial pass that finds ⌈´𝕨
|
||||
// If 𝕨 is boolean, compute from 𝕨¬⊸/𝕩 and 𝕨/𝕩
|
||||
// COULD handle small-range 𝕨 with equals-replicate
|
||||
// If +´»⊸≠𝕨 is small, process in chunks as a separate case
|
||||
// If +´𝕨<¯1 is large, filter out ¯1s.
|
||||
// COULD recompute statistics, may have enabled chunked or sorted code
|
||||
// If ∧´1↓»⊸<𝕨, that is, ∧⊸≡𝕨, each result array is a slice of 𝕩
|
||||
// COULD use slice types; seems dangerous--when will they be freed?
|
||||
// Remaining cases copy cells from 𝕩 individually
|
||||
// Converts 𝕨 to i32, COULD handle smaller types
|
||||
// CPU-sized cells handled quickly, 1-bit with bitp_get/set
|
||||
// SHOULD use memcpy and bit_cpy for other sizes
|
||||
// TRIED separating neg>0 and neg==0 loops, no effect
|
||||
|
||||
#include "../core.h"
|
||||
#include "../utils/talloc.h"
|
||||
#include "../utils/calls.h"
|
||||
#include "../builtins.h"
|
||||
#include "../utils/mut.h"
|
||||
|
||||
extern B ud_c1(B, B);
|
||||
extern B not_c1(B, B);
|
||||
extern B ne_c2(B, B, B);
|
||||
extern B slash_c1(B, B);
|
||||
extern B slash_c2(B, B, B);
|
||||
extern B select_c2(B, B, B);
|
||||
extern B take_c2(B, B, B);
|
||||
extern B drop_c2(B, B, B);
|
||||
extern B join_c2(B, B, B);
|
||||
|
||||
static Arr* arr_shChangeLen(Arr* a, ur r, usz* xsh, usz len) {
|
||||
assert(r > 1);
|
||||
@ -27,6 +47,223 @@ static void allocGroups(B* rp, usz ria, B z, u8 xt, ur xr, usz* xsh, i32* len, u
|
||||
if (xr==1) for (usz j = 0; j < ria; j++) { usz l=len[j]; if (!l) rp[j] = inc(z); else m_tyarrv(rp+j, width, l, xt); }
|
||||
else for (usz j = 0; j < ria; j++) { usz l=len[j]; rp[j] = !l ? inc(z) : m_shChangeLen(xt, xr, xsh, l, width, csz); }
|
||||
}
|
||||
static Arr* m_bitarr_nop(usz ia) { return m_arr(BITARR_SZ(ia), t_bitarr, ia); }
|
||||
static void allocBitGroups(B* rp, usz ria, B z, ur xr, usz* xsh, i32* len, usz width) {
|
||||
if (xr==1) for (usz j = 0; j < ria; j++) { usz l=len[j]; rp[j] = !l ? inc(z) : taga(arr_shVec(m_bitarr_nop(l))); }
|
||||
else for (usz j = 0; j < ria; j++) { usz l=len[j]; rp[j] = !l ? inc(z) : taga(arr_shChangeLen(m_bitarr_nop(l*width), xr, xsh, l)); }
|
||||
}
|
||||
|
||||
// Integer list w
|
||||
static B group_simple(B w, B x, ur xr, usz wia, usz xn, usz* xsh, u8 we) {
|
||||
i64 ria = 0;
|
||||
bool bad = false, sort = true;
|
||||
usz neg = 0, change = 0;
|
||||
void *wp0 = tyany_ptr(w);
|
||||
#define CASE(T) case el_##T: { \
|
||||
T max = -1, prev = -1; \
|
||||
for (usz i = 0; i < xn; i++) { \
|
||||
T n = ((T*)wp0)[i]; \
|
||||
if (n>max) max = n; \
|
||||
bad |= n < -1; \
|
||||
neg += n == -1; \
|
||||
sort &= prev <= n; \
|
||||
change += prev != n; \
|
||||
prev = n; \
|
||||
} \
|
||||
if (wia>xn) { ria=((T*)wp0)[xn]; bad|=ria<-1; } \
|
||||
i64 m=(i64)max+1; if (m>ria) ria=m; \
|
||||
break; }
|
||||
switch (we) { default:UD;
|
||||
CASE(i8) CASE(i16) CASE(i32)
|
||||
// Boolean w is special-cased before we would check sort or change
|
||||
case el_bit: ria = xn? 1+bit_has(wp0,xn,1) : wia? bitp_get(wp0,0) : 0; break;
|
||||
}
|
||||
#undef CASE
|
||||
if (bad) thrM("⊔: 𝕨 can't contain elements less than ¯1");
|
||||
if (ria > (i64)(USZ_MAX)) thrOOM();
|
||||
|
||||
Arr* r = arr_shVec(m_fillarrp(ria)); fillarr_setFill(r, m_f64(0));
|
||||
B* rp = fillarr_ptr(r);
|
||||
for (usz i = 0; i < ria; i++) rp[i] = m_f64(0); // don't break if allocation errors
|
||||
|
||||
B xf = getFillQ(x);
|
||||
Arr* rf = m_fillarrp(0); fillarr_setFill(rf, xf);
|
||||
if (xr==1) arr_shVec(rf); else arr_shChangeLen(rf, xr, xsh, 0);
|
||||
|
||||
B z = taga(rf);
|
||||
fillarr_setFill(r, z);
|
||||
|
||||
if (ria <= 1) {
|
||||
if (ria == 0) goto dec_ret; // Needed so wia>0
|
||||
if (neg == 0) { rp[0]=inc(x); goto dec_ret; }
|
||||
// else, 𝕨 is a mix of 0 and ¯1 (and maybe trailing 1)
|
||||
}
|
||||
if (we==el_bit) {
|
||||
assert(ria == 2);
|
||||
if (wia>xn) w = take_c2(m_f64(0), m_f64(xn), w);
|
||||
rp[1] = slash_c2(m_f64(0), inc(w), inc(x));
|
||||
rp[0] = slash_c2(m_f64(0), not_c1(m_f64(0), w), x);
|
||||
return taga(r);
|
||||
}
|
||||
// Needed to make sure wia>0 for ip[wia-1] below
|
||||
if (neg==xn) {
|
||||
FILL_TO(rp, el_B, 0, z, ria);
|
||||
goto dec_ret;
|
||||
}
|
||||
TALLOC(i32, pos, 2*ria+1); i32* len = pos+ria+1;
|
||||
|
||||
bool notB = TI(x,elType) != el_B;
|
||||
u8 xt = arrNewType(TY(x));
|
||||
u8 xl = arrTypeBitsLog(TY(x));
|
||||
bool bits = xl == 0;
|
||||
u64 width = bits ? 1 : 1<<(xl-3); // cell width in bits if bits==1, bytes otherwise
|
||||
usz csz = 1;
|
||||
if (RARE(xr>1)) {
|
||||
width *= csz = arr_csz(x);
|
||||
usz cs = csz | (csz==0);
|
||||
xl += CTZ(cs);
|
||||
if (bits && xl>=3) { bits=0; width>>=3; }
|
||||
if ((cs & (cs-1)) || xl>7) xl = 7;
|
||||
}
|
||||
|
||||
// Few changes in 𝕨: move in chunks
|
||||
if (xn>64 && notB && change<(xn*width)/32) {
|
||||
#define C1(F,X ) F##_c1(m_f64(0),X )
|
||||
#define C2(F,X,W) F##_c2(m_f64(0),X,W)
|
||||
|
||||
u64* mp; B m = m_bitarrv(&mp, xn);
|
||||
u8* wp0 = tyany_ptr(w);
|
||||
we = TI(w,elType);
|
||||
CMP_AA_IMM(ne, we, mp, wp0-elWidth(we), wp0, xn);
|
||||
bitp_set(mp, 0, -1!=o2fG(IGetU(w,0)));
|
||||
|
||||
B ind = C1(slash, m);
|
||||
w = C2(select, inc(ind), w);
|
||||
#undef C1
|
||||
#undef C2
|
||||
if (TI(ind,elType)!=el_i32) ind = taga(cpyI32Arr(ind));
|
||||
if (TI(w ,elType)!=el_i32) w = taga(cpyI32Arr(w ));
|
||||
wia = IA(ind);
|
||||
|
||||
i32* ip = i32any_ptr(ind);
|
||||
i32* wp = i32any_ptr(w);
|
||||
usz i0 = ip[0];
|
||||
for (usz i=0; i<wia-1; i++) ip[i] = ip[i+1]-ip[i];
|
||||
ip[wia-1] = xn-ip[wia-1];
|
||||
for (usz i = 0; i < ria; i++) len[i] = pos[i] = 0;
|
||||
for (usz i = 0; i < wia; i++) len[wp[i]]+=ip[i];
|
||||
|
||||
void* xp = tyany_ptr(x);
|
||||
|
||||
#define GROUP_CHUNKED(CPY) \
|
||||
for (u64 i=0, k=i0*width; i<wia; i++) { \
|
||||
u64 k0 = k; \
|
||||
u64 l = ip[i]*width; k += l; \
|
||||
i32 n = wp[i]; if (n<0) continue; \
|
||||
CPY(tyarr_ptr(rp[n]), pos[n], xp, k0, l); \
|
||||
pos[n] += l; \
|
||||
}
|
||||
if (csz==0) {
|
||||
allocBitGroups(rp, ria, z, xr, xsh, len, width);
|
||||
} if (!bits) {
|
||||
allocGroups(rp, ria, z, xt, xr, xsh, len, width, csz);
|
||||
GROUP_CHUNKED(MEM_CPY)
|
||||
} else {
|
||||
allocBitGroups(rp, ria, z, xr, xsh, len, width);
|
||||
GROUP_CHUNKED(bit_cpy)
|
||||
}
|
||||
#undef GROUP_CHUNKED
|
||||
decG(ind);
|
||||
goto done;
|
||||
}
|
||||
|
||||
// Many ¯1s: filter out, then continue
|
||||
if (xn>32 && neg>(bits?0:xn/4)+xn/8) {
|
||||
if (wia>xn) w = take_c2(m_f64(0), m_f64(xn), w);
|
||||
B m = ne_c2(m_f64(0), m_f64(-1), inc(w));
|
||||
w = slash_c2(m_f64(0), inc(m), w);
|
||||
x = slash_c2(m_f64(0), m, x); xn = *SH(x);
|
||||
neg = 0;
|
||||
}
|
||||
if (TI(w,elType)!=el_i32) w = taga(cpyI32Arr(w));
|
||||
i32* wp = i32any_ptr(w);
|
||||
for (usz i = 0; i < ria; i++) len[i] = pos[i] = 0;
|
||||
for (usz i = 0; i < xn; i++) len[wp[i]]++; // overallocation makes this safe after n<-1 check
|
||||
|
||||
u8 xk = xl - 3;
|
||||
if (notB && csz==0) { // Empty cells, no movement needed
|
||||
allocBitGroups(rp, ria, z, xr, xsh, len, width);
|
||||
} else if (notB && sort) { // Sorted 𝕨, that is, partition 𝕩
|
||||
void* xp = tyany_ptr(x);
|
||||
u64 i=neg*width;
|
||||
#define GROUP_SORT(CPY, ALLOC) \
|
||||
for (usz j=0; j<ria; j++) { \
|
||||
usz l = len[j]; \
|
||||
if (!l) { rp[j]=inc(z); continue; } \
|
||||
ALLOC; \
|
||||
u64 lw = l*width; \
|
||||
CPY(tyarr_ptr(rp[j]), 0, xp, i, lw); \
|
||||
i += lw; \
|
||||
}
|
||||
if (!bits) {
|
||||
if (xr==1) GROUP_SORT(MEM_CPY, m_tyarrv(rp+j, width, l, xt))
|
||||
else GROUP_SORT(MEM_CPY, rp[j] = m_shChangeLen(xt, xr, xsh, l, width, csz))
|
||||
} else {
|
||||
if (xr==1) GROUP_SORT(bit_cpy, rp[j] = taga(arr_shVec(m_bitarr_nop(l))))
|
||||
else GROUP_SORT(bit_cpy, rp[j] = taga(arr_shChangeLen(m_bitarr_nop(l*width), xr, xsh, l)))
|
||||
}
|
||||
#undef GROUP_SORT
|
||||
} else if (notB && xk <= 3) { // Cells of 𝕩 are CPU-sized
|
||||
void* xp = tyany_ptr(x);
|
||||
allocGroups(rp, ria, z, xt, xr, xsh, len, width, csz);
|
||||
switch(xk) { default: UD;
|
||||
case 0: for (usz i = 0; i < xn; i++) { i32 n = wp[i]; if (n>=0) ((u8* )tyarr_ptr(rp[n]))[pos[n]++] = ((u8* )xp)[i]; } break;
|
||||
case 1: for (usz i = 0; i < xn; i++) { i32 n = wp[i]; if (n>=0) ((u16*)tyarr_ptr(rp[n]))[pos[n]++] = ((u16*)xp)[i]; } break;
|
||||
case 2: for (usz i = 0; i < xn; i++) { i32 n = wp[i]; if (n>=0) ((u32*)tyarr_ptr(rp[n]))[pos[n]++] = ((u32*)xp)[i]; } break;
|
||||
case 3: for (usz i = 0; i < xn; i++) { i32 n = wp[i]; if (n>=0) ((u64*)tyarr_ptr(rp[n]))[pos[n]++] = ((u64*)xp)[i]; } break;
|
||||
}
|
||||
} else if (xl == 0) { // 1-bit cells
|
||||
u64* xp = bitarr_ptr(x);
|
||||
allocBitGroups(rp, ria, z, xr, xsh, len, width);
|
||||
for (usz i = 0; i < xn; i++) {
|
||||
bool b = bitp_get(xp,i); i32 n = wp[i];
|
||||
if (n>=0) bitp_set(bitarr_ptr(rp[n]), pos[n]++, b);
|
||||
}
|
||||
} else { // Generic case
|
||||
for (usz i = 0; i < ria; i++) {
|
||||
usz l = len[i];
|
||||
Arr* c = m_fillarrp(l*csz);
|
||||
c->ia = 0;
|
||||
fillarr_setFill(c, inc(xf));
|
||||
if (xr==1) arr_shVec(c); else arr_shChangeLen(c, xr, xsh, l);
|
||||
rp[i] = taga(c);
|
||||
}
|
||||
if (csz==0) goto done;
|
||||
SLOW2("𝕨⊔𝕩", w, x);
|
||||
SGet(x)
|
||||
if (csz == 1) {
|
||||
for (usz i = 0; i < xn; i++) {
|
||||
i32 n = wp[i];
|
||||
if (n>=0) fillarr_ptr(a(rp[n]))[pos[n]++] = Get(x, i);
|
||||
}
|
||||
} else {
|
||||
for (usz i = 0; i < xn; i++) {
|
||||
i32 n = wp[i];
|
||||
if (n<0) continue;
|
||||
usz p = (pos[n]++)*csz;
|
||||
B* rnp = fillarr_ptr(a(rp[n])) + p;
|
||||
for (usz j = 0; j < csz; j++) rnp[j] = Get(x, i*csz + j);
|
||||
}
|
||||
}
|
||||
for (usz i = 0; i < ria; i++) a(rp[i])->ia = len[i]*csz;
|
||||
}
|
||||
|
||||
done:
|
||||
TFREE(pos);
|
||||
dec_ret:
|
||||
decG(w); decG(x);
|
||||
return taga(r);
|
||||
}
|
||||
|
||||
extern B rt_group;
|
||||
B group_c2(B t, B w, B x) {
|
||||
@ -35,182 +272,21 @@ B group_c2(B t, B w, B x) {
|
||||
if (isArr(w) && RNK(w)==1 && xr>=1 && depth(w)==1) {
|
||||
usz wia = IA(w);
|
||||
usz* xsh = SH(x);
|
||||
usz xia = *xsh;
|
||||
if (wia-xia > 1) thrF("⊔: ≠𝕨 must be either ≠𝕩 or one bigger (%s≡≠𝕨, %s≡≠𝕩)", wia, xia);
|
||||
usz xn = *xsh;
|
||||
if (wia-xn > 1) thrF("⊔: ≠𝕨 must be either ≠𝕩 or one bigger (%s≡≠𝕨, %s≡≠𝕩)", wia, xn);
|
||||
u8 we = TI(w,elType);
|
||||
if (elInt(we)) {
|
||||
if (we==el_bit) w = taga(cpyI8Arr(w));
|
||||
i64 ria = 0;
|
||||
bool bad = false, sort = true;
|
||||
usz neg = 0, change = 0;
|
||||
void *wp0 = tyany_ptr(w);
|
||||
#define CASE(T) case el_##T: { \
|
||||
T max = -1, prev = -1; \
|
||||
for (usz i = 0; i < xia; i++) { \
|
||||
T n = ((T*)wp0)[i]; \
|
||||
if (n>max) max = n; \
|
||||
bad |= n < -1; \
|
||||
neg += n == -1; \
|
||||
sort &= prev <= n; \
|
||||
change += prev != n; \
|
||||
prev = n; \
|
||||
} \
|
||||
if (wia>xia) { ria=((T*)wp0)[xia]; bad|=ria<-1; } \
|
||||
i64 m=(i64)max+1; if (m>ria) ria=m; \
|
||||
break; }
|
||||
switch (we) { default:UD; case el_bit: CASE(i8) CASE(i16) CASE(i32) }
|
||||
#undef CASE
|
||||
if (bad) thrM("⊔: 𝕨 can't contain elements less than ¯1");
|
||||
if (ria > (i64)(USZ_MAX)) thrOOM();
|
||||
|
||||
Arr* r = arr_shVec(m_fillarrp(ria)); fillarr_setFill(r, m_f64(0));
|
||||
B* rp = fillarr_ptr(r);
|
||||
for (usz i = 0; i < ria; i++) rp[i] = m_f64(0); // don't break if allocation errors
|
||||
B xf = getFillQ(x);
|
||||
|
||||
Arr* rf = m_fillarrp(0); if (xr==1) arr_shVec(rf); else arr_shChangeLen(rf, xr, xsh, 0);
|
||||
fillarr_setFill(rf, m_f64(0));
|
||||
B z = taga(rf);
|
||||
fillarr_setFill(r, z);
|
||||
|
||||
// Both cases needed to make sure wia>0 for ip[wia-1] below
|
||||
if (ria==0) goto setfill_dec_ret;
|
||||
if (neg==xia) {
|
||||
for (usz i = 0; i < ria; i++) rp[i] = inc(z);
|
||||
goto setfill_dec_ret;
|
||||
}
|
||||
TALLOC(i32, pos, 2*ria+1); i32* len = pos+ria+1;
|
||||
|
||||
bool notB = TI(x,elType) != el_B;
|
||||
u8 xt = arrNewType(TY(x));
|
||||
u8 xl = arrTypeBitsLog(TY(x));
|
||||
bool bits = xl == 0;
|
||||
u64 width = bits ? 1 : 1<<(xl-3); // cell width in bits if bits==1, bytes otherwise
|
||||
usz csz = 1;
|
||||
if (RARE(xr>1)) {
|
||||
width *= csz = arr_csz(x);
|
||||
xl += CTZ(csz);
|
||||
if (bits && xl>=3) { bits=0; width>>=3; }
|
||||
if ((csz & (csz-1)) || xl>7) xl = 7;
|
||||
}
|
||||
if (xia>64 && notB && !bits && change<(xia*width)/32) {
|
||||
#define C1(F,X ) F##_c1(m_f64(0),X )
|
||||
#define C2(F,X,W) F##_c2(m_f64(0),X,W)
|
||||
|
||||
u64* mp; B m = m_bitarrv(&mp, xia);
|
||||
u8* wp0 = tyany_ptr(w);
|
||||
we = TI(w,elType);
|
||||
CMP_AA_IMM(ne, we, mp, wp0-elWidth(we), wp0, xia);
|
||||
bitp_set(mp, 0, -1!=o2fG(IGetU(w,0)));
|
||||
|
||||
B ind = C1(slash, m);
|
||||
w = C2(select, inc(ind), w);
|
||||
#undef C1
|
||||
#undef C2
|
||||
if (TI(ind,elType)!=el_i32) ind = taga(cpyI32Arr(ind));
|
||||
if (TI(w ,elType)!=el_i32) w = taga(cpyI32Arr(w ));
|
||||
wia = IA(ind);
|
||||
|
||||
i32* ip = i32any_ptr(ind);
|
||||
i32* wp = i32any_ptr(w);
|
||||
usz i0 = ip[0];
|
||||
for (usz i=0; i<wia-1; i++) ip[i] = ip[i+1]-ip[i];
|
||||
ip[wia-1] = xia-ip[wia-1];
|
||||
for (usz i = 0; i < ria; i++) len[i] = pos[i] = 0;
|
||||
for (usz i = 0; i < wia; i++) len[wp[i]]+=ip[i];
|
||||
|
||||
void* xp = tyany_ptr(x);
|
||||
|
||||
allocGroups(rp, ria, z, xt, xr, xsh, len, width, csz);
|
||||
for (u64 i=0, k=i0*width; i<wia; i++) {
|
||||
u64 k0 = k;
|
||||
u64 l = ip[i]*width; k += l;
|
||||
i32 n = wp[i]; if (n<0) continue;
|
||||
memcpy((u8*)tyarr_ptr(rp[n])+pos[n], (u8*)xp+k0, l);
|
||||
pos[n] += l;
|
||||
}
|
||||
decG(ind);
|
||||
} else {
|
||||
if (xia>32 && neg>xia/4+xia/8) {
|
||||
if (wia>xia) w = take_c2(m_f64(0), m_f64(xia), w);
|
||||
B m = ne_c2(m_f64(0), m_f64(-1), inc(w));
|
||||
w = slash_c2(m_f64(0), inc(m), w);
|
||||
x = slash_c2(m_f64(0), m, x); xia = IA(x);
|
||||
neg = 0;
|
||||
}
|
||||
if (TI(w,elType)!=el_i32) w = taga(cpyI32Arr(w));
|
||||
i32* wp = i32any_ptr(w);
|
||||
for (usz i = 0; i < ria; i++) len[i] = pos[i] = 0;
|
||||
for (usz i = 0; i < xia; i++) len[wp[i]]++; // overallocation makes this safe after n<-1 check
|
||||
|
||||
u8 xk = xl - 3;
|
||||
if (notB && !bits && sort) {
|
||||
void* xp = tyany_ptr(x);
|
||||
u64 i=neg*width;
|
||||
#define GROUP_SORT(ALLOC) \
|
||||
for (usz j=0; j<ria; j++) { \
|
||||
usz l = len[j]; \
|
||||
if (!l) { rp[j]=inc(z); continue; } \
|
||||
ALLOC; \
|
||||
u64 lw = l*width; \
|
||||
memcpy(tyarr_ptr(rp[j]), (u8*)xp+i, lw); \
|
||||
i += lw; \
|
||||
}
|
||||
if (xr==1) GROUP_SORT(m_tyarrv(rp+j, width, l, xt))
|
||||
else GROUP_SORT(rp[j] = m_shChangeLen(xt, xr, xsh, l, width, csz))
|
||||
#undef GROUP_SORT
|
||||
} else if (notB && xk <= 3) {
|
||||
void* xp = tyany_ptr(x);
|
||||
allocGroups(rp, ria, z, xt, xr, xsh, len, width, csz);
|
||||
switch(xk) { default: UD;
|
||||
case 0: for (usz i = 0; i < xia; i++) { i32 n = wp[i]; if (n>=0) ((u8* )tyarr_ptr(rp[n]))[pos[n]++] = ((u8* )xp)[i]; } break;
|
||||
case 1: for (usz i = 0; i < xia; i++) { i32 n = wp[i]; if (n>=0) ((u16*)tyarr_ptr(rp[n]))[pos[n]++] = ((u16*)xp)[i]; } break;
|
||||
case 2: for (usz i = 0; i < xia; i++) { i32 n = wp[i]; if (n>=0) ((u32*)tyarr_ptr(rp[n]))[pos[n]++] = ((u32*)xp)[i]; } break;
|
||||
case 3: for (usz i = 0; i < xia; i++) { i32 n = wp[i]; if (n>=0) ((u64*)tyarr_ptr(rp[n]))[pos[n]++] = ((u64*)xp)[i]; } break;
|
||||
}
|
||||
} else {
|
||||
for (usz i = 0; i < ria; i++) {
|
||||
usz l = len[i];
|
||||
Arr* c = m_fillarrp(l*csz);
|
||||
c->ia = 0;
|
||||
fillarr_setFill(c, inc(xf));
|
||||
if (xr==1) arr_shVec(c); else arr_shChangeLen(c, xr, xsh, l);
|
||||
rp[i] = taga(c);
|
||||
}
|
||||
SLOW2("𝕨⊔𝕩", w, x);
|
||||
SGet(x)
|
||||
if (csz == 1) {
|
||||
for (usz i = 0; i < xia; i++) {
|
||||
i32 n = wp[i];
|
||||
if (n>=0) fillarr_ptr(a(rp[n]))[pos[n]++] = Get(x, i);
|
||||
}
|
||||
} else {
|
||||
for (usz i = 0; i < xia; i++) {
|
||||
i32 n = wp[i];
|
||||
if (n<0) continue;
|
||||
usz p = (pos[n]++)*csz;
|
||||
B* rnp = fillarr_ptr(a(rp[n])) + p;
|
||||
for (usz j = 0; j < csz; j++) rnp[j] = Get(x, i*csz + j);
|
||||
}
|
||||
}
|
||||
for (usz i = 0; i < ria; i++) a(rp[i])->ia = len[i]*csz;
|
||||
}
|
||||
}
|
||||
TFREE(pos);
|
||||
setfill_dec_ret:
|
||||
fillarr_setFill(rf, xf);
|
||||
decG(w); decG(x);
|
||||
return taga(r);
|
||||
return group_simple(w, x, xr, wia, xn, xsh, we);
|
||||
} else if (xr==1) {
|
||||
SLOW2("𝕨⊔𝕩", w, x);
|
||||
SGetU(w)
|
||||
i64 ria = wia==xia? 0 : o2i64(GetU(w, xia));
|
||||
i64 ria = wia==xn? 0 : o2i64(GetU(w, xn));
|
||||
if (ria<0) {
|
||||
if (ria<-1) thrM("⊔: 𝕨 can't contain elements less than ¯1");
|
||||
ria = 0;
|
||||
}
|
||||
ria--;
|
||||
for (usz i = 0; i < xia; i++) {
|
||||
for (usz i = 0; i < xn; i++) {
|
||||
B cw = GetU(w, i);
|
||||
if (!q_i64(cw)) goto base;
|
||||
i64 c = o2i64G(cw);
|
||||
@ -222,7 +298,7 @@ B group_c2(B t, B w, B x) {
|
||||
TALLOC(i32, lenO, ria+1); i32* len = lenO+1;
|
||||
TALLOC(i32, pos, ria);
|
||||
for (usz i = 0; i < ria; i++) len[i] = pos[i] = 0;
|
||||
for (usz i = 0; i < xia; i++) len[o2i64G(GetU(w, i))]++;
|
||||
for (usz i = 0; i < xn; i++) len[o2i64G(GetU(w, i))]++;
|
||||
|
||||
Arr* r = arr_shVec(m_fillarrp(ria)); fillarr_setFill(r, m_f64(0));
|
||||
B* rp = fillarr_ptr(r);
|
||||
@ -240,7 +316,7 @@ B group_c2(B t, B w, B x) {
|
||||
fillarr_setFill(rf, xf);
|
||||
fillarr_setFill(r, taga(rf));
|
||||
SGet(x)
|
||||
for (usz i = 0; i < xia; i++) {
|
||||
for (usz i = 0; i < xn; i++) {
|
||||
i64 n = o2i64G(GetU(w, i));
|
||||
if (n>=0) fillarr_ptr(a(rp[n]))[pos[n]++] = Get(x, i);
|
||||
}
|
||||
|
||||
@ -230,9 +230,7 @@ static B compress_grouped(u64* wp, B x, usz wia, usz wsum, u8 xt) {
|
||||
return withFill(HARR_FV(rp), getFillQ(x));
|
||||
}
|
||||
}
|
||||
#define MEM_CPY(R,RI,X,XI,L) memcpy(R+RI, X+XI, L)
|
||||
COMPRESS_GROUP(MEM_CPY)
|
||||
#undef MEM_CPY
|
||||
if (is_B) {
|
||||
for (usz i = 0; i < wsum*csz; i++) inc(((B*)rp)[i]);
|
||||
r = withFill(rh.b, getFillQ(x));
|
||||
|
||||
@ -118,6 +118,8 @@ static void mut_copy(Mut* m, usz ms, B x, usz xs, usz l) { assert(isArr(x)); m->
|
||||
#define mut_copyG(N, ms, x, xs, l) N##_mutfns.m_copyG(N##_mutarr, ms, x, xs, l)
|
||||
|
||||
|
||||
// Companion to bit_cpy when uniform syntax is wanted
|
||||
#define MEM_CPY(R,RI,X,XI,L) memcpy((u8*)(R)+(RI), (u8*)(X)+(XI), (L))
|
||||
|
||||
static void bit_cpy(u64* r, usz rs, u64* x, usz xs, usz l) {
|
||||
u64 re = rs+(u64)l;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user