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.

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

print feature flags used for matching pkgimage #50172

Merged
merged 12 commits into from
Aug 7, 2023
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: Jameson Nash <vtjnash@gmail.com>
  • Loading branch information
vchuravy and vtjnash committed Aug 5, 2023
commit 00ddf104cdbef497a35e387b45e84d3f095f9290
4 changes: 2 additions & 2 deletions src/processor_arm.cpp
Original file line number Diff line number Diff line change
@@ -1588,7 +1588,7 @@ static uint32_t sysimg_init_cb(const void *id, jl_value_t **rejection_reason)
return match.best_idx;
}

static uint32_t pkgimg_init_cb(const void *id, jl_value_t** rejection_reason)
static uint32_t pkgimg_init_cb(const void *id, jl_value_t **rejection_reason JL_REQUIRE_ROOTED_SLOT)
{
TargetData<feature_sz> target = jit_targets.front();
auto pkgimg = deserialize_target_data<feature_sz>((const uint8_t*)id);
@@ -1826,7 +1826,7 @@ jl_image_t jl_init_processor_pkgimg(void *hdl)

JL_DLLEXPORT jl_value_t* jl_check_pkgimage_clones(char *data)
{
jl_value_t *rejection_reason;
jl_value_t *rejection_reason = NULL;
JL_GC_PUSH1(&rejection_reason);
uint32_t match_idx = pkgimg_init_cb(data, &rejection_reason);
JL_GC_POP();
2 changes: 1 addition & 1 deletion src/processor_fallback.cpp
Original file line number Diff line number Diff line change
@@ -177,7 +177,7 @@ JL_DLLEXPORT void jl_dump_host_cpu(void)

JL_DLLEXPORT jl_value_t* jl_check_pkgimage_clones(char *data)
{
jl_value_t *rejection_reason;
jl_value_t *rejection_reason = NULL;
JL_GC_PUSH1(&rejection_reason);
uint32_t match_idx = pkgimg_init_cb(data, &rejection_reason);
JL_GC_POP();
2 changes: 1 addition & 1 deletion src/processor_x86.cpp
Original file line number Diff line number Diff line change
@@ -1036,7 +1036,7 @@ JL_DLLEXPORT void jl_dump_host_cpu(void)

JL_DLLEXPORT jl_value_t* jl_check_pkgimage_clones(char *data)
{
jl_value_t *rejection_reason;
jl_value_t *rejection_reason = NULL;
JL_GC_PUSH1(&rejection_reason);
uint32_t match_idx = pkgimg_init_cb(data, &rejection_reason);
JL_GC_POP();