Skip to content
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

Jump to bottom

u3: optimizes u3i_edit (nock opcode 10) #362

Merged
merged 6 commits into from
Nov 29, 2023
Merged

u3: optimizes u3i_edit (nock opcode 10) #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a244cc5
vere: adds benchmark for opcode 10
joemfb Nov 16, 2023
a6debdb
TMP remove mutation optimization from u3i_edit()
joemfb Nov 16, 2023
acd4a94
Revert "TMP remove mutation optimization from u3i_edit()"
joemfb Nov 16, 2023
d6988e6
u3: rewrites u3i_edit into a loop (tail recursion modulo cons)
joemfb Sep 16, 2022
fa84fd8
u3: further optimizes u3i_edit, removing head/tail branches
joemfb Sep 16, 2022
e182de8
u3: further optimizes u3i_edit, inlining axis bit math
joemfb Jul 22, 2022
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
178 changes: 44 additions & 134 deletions pkg/noun/imprison.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,133 +610,6 @@ u3i_list(u3_weak som, ...)
return u3kb_flop(lit);
}

static u3_noun
_edit_cat(u3_noun big, c3_l axe_l, u3_noun som)
{
if ( c3n == u3du(big) ) {
return u3m_bail(c3__exit);
}
else {
u3_noun pro;
switch ( axe_l ) {
case 2:
pro = u3nc(som, u3k(u3t(big)));
break;
case 3:
pro = u3nc(u3k(u3h(big)), som);
break;
default: {
c3_l mor_l = u3x_mas(axe_l);
pro = ( 2 == u3x_cap(axe_l) )
? u3nc(_edit_cat(u3k(u3h(big)), mor_l, som), u3k(u3t(big)))
: u3nc(u3k(u3h(big)), _edit_cat(u3k(u3t(big)), mor_l, som));
break;
}
}
u3z(big);
return pro;
}
}

static u3_noun
_edit(u3_noun big, u3_noun axe, u3_noun som)
{
if ( c3y == u3a_is_cat(axe) ) {
return _edit_cat(big, (c3_l) axe, som);
}
else if ( c3n == u3du(big) ) {
return u3m_bail(c3__exit);
}
else {
u3_noun mor = u3qc_mas(axe),
pro = ( 2 == u3qc_cap(axe) )
? u3nc(_edit(u3k(u3h(big)), mor, som), u3k(u3t(big)))
: u3nc(u3k(u3h(big)), _edit(u3k(u3t(big)), mor, som));
u3z(mor);
u3z(big);
return pro;
}
}

static u3_noun _edit_or_mutate_cat(u3_noun, c3_l, u3_noun);
static u3_noun _edit_or_mutate(u3_noun, u3_noun, u3_noun);

static void
_mutate_cat(u3_noun big, c3_l axe_l, u3_noun som)
{
if ( c3n == u3du(big) ) {
u3m_bail(c3__exit);
}
else {
u3a_cell* cel_u = (void*) u3a_to_ptr(big);
switch ( axe_l ) {
case 2:
u3z(cel_u->hed);
cel_u->hed = som;
break;
case 3:
u3z(cel_u->tel);
cel_u->tel = som;
break;
default: {
u3_noun* tar = ( 2 == u3x_cap(axe_l) )
? &(cel_u->hed)
: &(cel_u->tel);
*tar = _edit_or_mutate_cat(*tar, u3x_mas(axe_l), som);
}
}
cel_u->mug_w = 0;
}
}

static void
_mutate(u3_noun big, u3_noun axe, u3_noun som)
{
if ( c3y == u3a_is_cat(axe) ) {
_mutate_cat(big, (c3_l) axe, som);
}
else if ( c3n == u3du(big) ) {
u3m_bail(c3__exit);
}
else {
u3a_cell* cel_u = (void*) u3a_to_ptr(big);
u3_noun mor = u3qc_mas(axe);
u3_noun* tar = ( 2 == u3qc_cap(axe) )
? &(cel_u->hed)
: &(cel_u->tel);
*tar = _edit_or_mutate(*tar, mor, som);
cel_u->mug_w = 0;
u3z(mor);
}
}

static u3_noun
_edit_or_mutate_cat(u3_noun big, c3_l axe_l, u3_noun som)
{
if ( c3y == u3a_is_mutable(u3R, big) ) {
_mutate_cat(big, axe_l, som);
return big;
}
else {
return _edit_cat(big, axe_l, som);
}
}

static u3_noun
_edit_or_mutate(u3_noun big, u3_noun axe, u3_noun som)
{
if ( c3y == u3a_is_cat(axe) ) {
return _edit_or_mutate_cat(big, (c3_l) axe, som);
}
else if ( c3y == u3a_is_mutable(u3R, big) ) {
_mutate(big, axe, som);
return big;
}
else {
return _edit(big, axe, som);
}
}

/* u3i_edit():
**
** Mutate `big` at axis `axe` with new value `som`.
Expand All @@ -745,15 +618,52 @@ _edit_or_mutate(u3_noun big, u3_noun axe, u3_noun som)
u3_noun
u3i_edit(u3_noun big, u3_noun axe, u3_noun som)
{
u3_noun pro;
u3_noun* out = &pro;

switch ( axe ) {
case 0:
return u3m_bail(c3__exit);
case 1:
u3z(big);
return som;
default:
return _edit_or_mutate(big, axe, som);
case 0: return u3m_bail(c3__exit);
case 1: break;

default: {
c3_w dep_w = u3r_met(0, u3x_atom(axe)) - 2;
const c3_w* axe_w = ( c3y == u3a_is_cat(axe) )
? &axe
: ((u3a_atom*)u3a_to_ptr(axe))->buf_w;

do {
u3a_cell* big_u = u3a_to_ptr(big);
u3_noun* old = (u3_noun*)&(big_u->hed);
const c3_y bit_y = 1 & (axe_w[dep_w >> 5] >> (dep_w & 31));

if ( c3n == u3a_is_cell(big) ) {
return u3m_bail(c3__exit);
}
else if ( c3y == u3a_is_mutable(u3R, big) ) {
*out = big;
out = &(old[bit_y]);
big = *out;
big_u->mug_w = 0;
}
else {
u3_noun luz = big;
u3_noun* new[2];

*out = u3i_defcons(&new[0], &new[1]);
out = new[bit_y];
big = u3k(old[bit_y]);
*(new[!bit_y]) = u3k(old[!bit_y]);

u3z(luz);
}
}
while ( dep_w-- );
}
}

u3z(big);
*out = som;
return pro;
}

/* u3i_molt():
Expand Down
59 changes: 59 additions & 0 deletions pkg/vere/benchmarks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/// @file

#include "noun.h"
#include "jets/q.h"
#include "ur.h"
#include "vere.h"

Expand Down Expand Up @@ -387,6 +388,63 @@ _cue_soft_bench(void)
u3z(vat);
}

static void
_edit_bench_impl(c3_w max_w)
{
u3_assert( max_w && (c3y == u3a_is_cat(max_w)) );

c3_w* axe_w = c3_calloc(((max_w + 31) >> 5) << 2);
c3_w bit_w;
u3_noun lit = u3qb_reap(max_w, 1);
u3_noun axe;

axe_w[0] = bit_w = 2;

do {
axe = u3i_words((bit_w + 31) >> 5, axe_w);
lit = u3i_edit(lit, axe, 2);
u3z(axe);

axe_w[bit_w >> 5] |= (c3_w)1 << (bit_w & 31);
bit_w++;
}
while ( bit_w <= max_w );

u3z(lit);
c3_free(axe_w);
}

static void
_edit_bench(void)
{
struct timeval b4, f2, d0;
c3_w mil_w;

fprintf(stderr, "\r\nopcode 10 microbenchmark:\r\n");

{
gettimeofday(&b4, 0);

_edit_bench_impl(1000);

gettimeofday(&f2, 0);
timersub(&f2, &b4, &d0);
mil_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000);
fprintf(stderr, " opcode 10 1k list: %u ms\r\n", mil_w);
}

{
gettimeofday(&b4, 0);

_edit_bench_impl(10000);

gettimeofday(&f2, 0);
timersub(&f2, &b4, &d0);
mil_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000);
fprintf(stderr, " opcode 10 10k list: %u ms\r\n", mil_w);
}
}

/* main(): run all benchmarks
*/
int
Expand All @@ -397,6 +455,7 @@ main(int argc, char* argv[])
_jam_bench();
_cue_bench();
_cue_soft_bench();
_edit_bench();

// GC
//
Expand Down