Revision c3861f5c7371fea2fc5d20404a7f77c927bbd61b authored by Shuhei Kadowaki on 14 August 2021, 12:49:21 UTC, committed by Shuhei Kadowaki on 23 August 2021, 15:09:13 UTC
Built on top of #41882, this PR sorts out the constant-prop' interface yet more, particularly generalizes `force_const_prop` to `const_prop_config` so that it can turn on and off each heuristic. The main motivation here is, in #41882, we want to force const-prop' on `setproperty` even when its return type is already `Const` for the sake of succeeding inlining, by skipping all the `const_prop_xxx_heuristic` checks. But I still found we want to apply `const_prop_entry_heuristic` to `getproperty`, because if we already know very accurate result for a `getproperty` call, usually there is really no motivation for constant-prop', e.g.: ```julia struct FZero end Base.getproperty(::FZero, ::Symbol) = 0.0 getproperty(FZero(), :val) # const-prop' doesn't need to happen here ``` Now `force_const_prop(...) -> force::Bool` is refactored to `const_prop_config(...) -> config::UInt8`, which can turn on and off each heuristic based on the value of `config`. I also included another refactoring that inlines `const_prop_rettype_heuristic` into `const_prop_argument_heuristic`, because they really seem tightly coupled.
1 parent e1e4986
opaque_closure.c
#include "julia.h"
#include "julia_internal.h"
JL_DLLEXPORT jl_value_t *jl_invoke_opaque_closure(jl_opaque_closure_t *oc, jl_value_t **args, size_t nargs)
{
jl_value_t *ret = NULL;
JL_GC_PUSH1(&ret);
jl_task_t *ct = jl_current_task;
size_t last_age = ct->world_age;
ct->world_age = oc->world;
ret = jl_interpret_opaque_closure(oc, args, nargs);
jl_typeassert(ret, jl_tparam1(jl_typeof(oc)));
ct->world_age = last_age;
JL_GC_POP();
return ret;
}
jl_opaque_closure_t *jl_new_opaque_closure(jl_tupletype_t *argt, jl_value_t *isva,
jl_value_t *rt_lb, jl_value_t *rt_ub, jl_value_t *source, jl_value_t **env, size_t nenv)
{
if (!jl_is_tuple_type((jl_value_t*)argt)) {
jl_error("OpaqueClosure argument tuple must be a tuple type");
}
JL_TYPECHK(new_opaque_closure, bool, isva);
JL_TYPECHK(new_opaque_closure, type, rt_lb);
JL_TYPECHK(new_opaque_closure, type, rt_ub);
JL_TYPECHK(new_opaque_closure, method, source);
jl_task_t *ct = jl_current_task;
jl_value_t *oc_type JL_ALWAYS_LEAFTYPE;
oc_type = jl_apply_type2((jl_value_t*)jl_opaque_closure_type, (jl_value_t*)argt, rt_ub);
JL_GC_PROMISE_ROOTED(oc_type);
jl_value_t *captures = NULL;
JL_GC_PUSH1(&captures);
captures = jl_f_tuple(NULL, env, nenv);
jl_opaque_closure_t *oc = (jl_opaque_closure_t*)jl_gc_alloc(ct->ptls, sizeof(jl_opaque_closure_t), oc_type);
JL_GC_POP();
oc->source = (jl_method_t*)source;
oc->isva = jl_unbox_bool(isva);
oc->invoke = (jl_fptr_args_t)jl_invoke_opaque_closure;
oc->specptr = NULL;
oc->captures = captures;
oc->world = jl_world_counter;
return oc;
}
JL_CALLABLE(jl_new_opaque_closure_jlcall)
{
if (nargs < 5)
jl_error("new_opaque_closure: Not enough arguments");
return (jl_value_t*)jl_new_opaque_closure((jl_tupletype_t*)args[0],
args[1], args[2], args[3], args[4], &args[5], nargs-5);
}
// check whether the specified number of arguments is compatible with the
// specified number of parameters of the tuple type
STATIC_INLINE int jl_tupletype_length_compat(jl_value_t *v, size_t nargs) JL_NOTSAFEPOINT
{
v = jl_unwrap_unionall(v);
assert(jl_is_tuple_type(v));
size_t nparams = jl_nparams(v);
if (nparams == 0)
return nargs == 0;
jl_value_t *va = jl_tparam(v,nparams-1);
if (jl_is_vararg(va)) {
jl_value_t *len = jl_unwrap_vararg_num(va);
if (len &&jl_is_long(len))
return nargs == nparams - 1 + jl_unbox_long(len);
return nargs >= nparams - 1;
}
return nparams == nargs;
}
JL_CALLABLE(jl_f_opaque_closure_call)
{
jl_opaque_closure_t* oc = (jl_opaque_closure_t*)F;
jl_value_t *argt = jl_tparam0(jl_typeof(oc));
if (!jl_tupletype_length_compat(argt, nargs))
jl_method_error(F, args, nargs + 1, oc->world);
argt = jl_unwrap_unionall(argt);
assert(jl_is_datatype(argt));
jl_svec_t *types = jl_get_fieldtypes((jl_datatype_t*)argt);
size_t ntypes = jl_svec_len(types);
for (int i = 0; i < nargs; ++i) {
jl_value_t *typ = i >= ntypes ? jl_svecref(types, ntypes-1) : jl_svecref(types, i);
if (jl_is_vararg(typ))
typ = jl_unwrap_vararg(typ);
jl_typeassert(args[i], typ);
}
return oc->invoke(F, args, nargs);
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...