conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimize `equal?`. Don't initialize xhash until it is really needed. 

`make test-r7rs` gets 12s -> 9.5s, in which `equal?` is heavilly used.
This commit is contained in:
Sunrin SHIMURA (keen) 2015-01-12 11:33:22 +00:00
parent c611258760
commit 311fb62474
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bool.c
View File

@ -32,7 +32,7 @@ blob_equal_p(struct pic_blob *blob1, struct pic_blob *blob2)
} }
static bool static bool
internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, xhash *ht) internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, xhash *xh, bool xh_initted_p)
{ {
pic_value local = pic_nil_value(); pic_value local = pic_nil_value();
size_t c; size_t c;
@ -42,10 +42,15 @@ internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, xhash *
pic_errorf(pic, "Stack overflow in equal\n"); pic_errorf(pic, "Stack overflow in equal\n");
} }
if (pic_pair_p(x) || pic_vec_p(x)) { if (pic_pair_p(x) || pic_vec_p(x)) {
if (xh_get_ptr(ht, pic_obj_ptr(x)) != NULL) { if (! xh_initted_p) {
xh_init_ptr(xh, 0);
xh_initted_p = true;
}
if (xh_get_ptr(xh, pic_obj_ptr(x)) != NULL) {
return true; /* `x' was seen already. */ return true; /* `x' was seen already. */
} else { } else {
xh_put_ptr(ht, pic_obj_ptr(x), NULL); xh_put_ptr(xh, pic_obj_ptr(x), NULL);
} }
} }
} }
@ -71,7 +76,7 @@ internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, xhash *
if (pic_nil_p(local)) { if (pic_nil_p(local)) {
local = x; local = x;
} }
if (internal_equal_p(pic, pic_car(pic, x), pic_car(pic, y), depth + 1, ht)) { if (internal_equal_p(pic, pic_car(pic, x), pic_car(pic, y), depth + 1, xh, xh_initted_p)) {
x = pic_cdr(pic, x); x = pic_cdr(pic, x);
y = pic_cdr(pic, y); y = pic_cdr(pic, y);
@ -100,7 +105,7 @@ internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, xhash *
return false; return false;
} }
for (i = 0; i < u->len; ++i) { for (i = 0; i < u->len; ++i) {
if (! internal_equal_p(pic, u->data[i], v->data[i], depth + 1, ht)) if (! internal_equal_p(pic, u->data[i], v->data[i], depth + 1, xh, xh_initted_p))
return false; return false;
} }
return true; return true;
@ -111,12 +116,11 @@ internal_equal_p(pic_state *pic, pic_value x, pic_value y, size_t depth, xhash *
} }
bool bool
pic_equal_p(pic_state *pic, pic_value x, pic_value y){ pic_equal_p(pic_state *pic, pic_value x, pic_value y)
{
xhash ht; xhash ht;
xh_init_ptr(&ht, 0); return internal_equal_p(pic, x, y, 0, &ht, false);
return internal_equal_p(pic, x, y, 0, &ht);
} }
static pic_value static pic_value