suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix JIT bug related to unboxed arguments in self tail calls

Browse Source
This commit is contained in:
Matthew Flatt 2013-09-28 17:38:45 -04:00
parent af7dcf0dd0
commit 6d4ff30909
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/math/tests/stress/beta-test.rkt Normal file
View File

@ -0,0 +1,18 @@
#lang racket
;; This is a stress test for Racket, not for math.
;; (Producing a smaller test for Racket is difficult.)
(require math/special-functions
math/statistics)
(define (f x)
(flbeta-inc 2.0 3.0 x #f #t))
(define-values (l r)
(count-samples
(for/list ([_ (in-range 100000)])
(f #i40/499))))
(unless (= 1 (length l))
(error "failed: ~s ~s\n" l r))

2
racket/src/racket/src/jit.h
View File

@ -1549,7 +1549,7 @@ int scheme_is_non_gc(Scheme_Object *obj, int depth);
int scheme_jit_check_closure_flonum_bit(Scheme_Closure_Data *data, int pos, int delta);
# define CLOSURE_ARGUMENT_IS_FLONUM(data, pos) scheme_jit_check_closure_flonum_bit(data, pos, 0)
# define CLOSURE_CONTENT_IS_FLONUM(data, pos) scheme_jit_check_closure_flonum_bit(data, pos, data->num_params)
int scheme_jit_check_closure_extflonum_bit(Scheme_Closure_Data *data, int pos, int delta);
int scheme_jit_check_closure_extflonum_bit(Scheme_Closure_Data *data, int pos, int delta);
# define CLOSURE_ARGUMENT_IS_EXTFLONUM(data, pos) scheme_jit_check_closure_extflonum_bit(data, pos, 0)
# define CLOSURE_CONTENT_IS_EXTFLONUM(data, pos) scheme_jit_check_closure_extflonum_bit(data, pos, data->num_params)
#endif

11
racket/src/racket/src/jitcall.c
View File

@ -1191,6 +1191,7 @@ static int generate_self_tail_call(Scheme_Object *rator, mz_jit_state *jitter, i
rand = (alt_rands
? alt_rands[i+1+args_already_in_place]
: app->args[i+1+args_already_in_place]);
arg_tmp_offset += MZ_FPUSEL(extfl, 2*sizeof(double), sizeof(double));
/* Boxing definitely isn't needed if the value was from a local that doesn't hold
an unboxed value, otherwise we generate code to check dynamically. */
if (!SAME_TYPE(SCHEME_TYPE(rand), scheme_local_type)
@ -1198,7 +1199,6 @@ static int generate_self_tail_call(Scheme_Object *rator, mz_jit_state *jitter, i
|| (extfl && (SCHEME_GET_LOCAL_TYPE(rand) == SCHEME_LOCAL_TYPE_EXTFLONUM))) {
GC_CAN_IGNORE jit_insn *iref;
int aoffset;
arg_tmp_offset += MZ_FPUSEL(extfl, 2*sizeof(double), sizeof(double));
aoffset = JIT_FRAME_FLOSTACK_OFFSET - arg_tmp_offset;
if (i != num_rands - 1)
mz_pushr_p(JIT_R0);
@ -1235,6 +1235,15 @@ static int generate_self_tail_call(Scheme_Object *rator, mz_jit_state *jitter, i
/* Arguments already in place may also need to be boxed. */
arg_tmp_offset = jitter->self_restart_offset;
for (i = jitter->self_data->closure_size; i--; ) {
/* Skip over flonums unpacked from the closure. I think this never
happens, because I think that a self-call with already-in-place
flonum arguments will only happen when the closure is empty. */
if (CLOSURE_CONTENT_IS_FLONUM(jitter->self_data, i))
arg_tmp_offset -= sizeof(double);
else if (CLOSURE_CONTENT_IS_EXTFLONUM(jitter->self_data, i))
arg_tmp_offset -= 2*sizeof(double);
}
for (i = 0; i < args_already_in_place; i++) {
if (CLOSURE_ARGUMENT_IS_FLONUM(jitter->self_data, i)
|| CLOSURE_ARGUMENT_IS_EXTFLONUM(jitter->self_data, i)) {