Skip to content

[DYNAREC] Optimized bigblock add_next performance with hash table #3890

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

Merged
ptitSeb merged 2 commits into from
May 24, 2026
+21 −17
Merged

[DYNAREC] Optimized bigblock add_next performance with hash table #3890

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba20a4f
[DYNAREC] Optimized bigblock add_next performance with hash table
ksco May 24, 2026
26b6be8
kh_put alone is enough
ksco May 24, 2026
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
38 changes: 21 additions & 17 deletions src/dynarec/dynarec_native.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
#include "khash.h"

KHASH_MAP_INIT_INT64(table64, uint32_t)
KHASH_SET_INIT_INT64(nextset)

static kh_nextset_t* khnextset = NULL;

void printf_x64_instruction(dynarec_native_t* dyn, zydis_dec_t* dec, instruction_x64_t* inst, const char* name) {
uint8_t *ip = (uint8_t*)inst->addr;
Expand Down Expand Up @@ -65,16 +68,10 @@ void printf_x64_instruction(dynarec_native_t* dyn, zydis_dec_t* dec, instruction
void add_next(dynarec_native_t *dyn, uintptr_t addr) {
if (!BOX64DRENV(dynarec_bigblock))
return;
// exist?
for(int i=0; i<dyn->next_sz; ++i)
if(dyn->next[i]==addr)
return;
// put in a free slot
for(int i=0; i<dyn->next_sz; ++i)
if(!dyn->next[i]) {
dyn->next[i] = addr;
return;
}
int ret;
kh_put(nextset, khnextset, addr, &ret);
Copy link
Copy Markdown
Owner

@ptitSeb ptitSeb May 24, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a way to just use kh_put here, instead of kh_get+kh_put, and check ret to see if kh_put actualy add a key or not (ret==0 eans key aready exist so can exit here)

Copy link
Copy Markdown
Collaborator Author

@ksco ksco May 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

if(!ret)
return;
// add slots
if(dyn->next_sz == dyn->next_cap) {
printf_log(LOG_NONE, "Warning, overallocating next\n");
Expand All @@ -85,15 +82,19 @@ uintptr_t get_closest_next(dynarec_native_t *dyn, uintptr_t addr) {
// get closest, but no addresses before
uintptr_t best = 0;
int i = 0;
while((i<dyn->next_sz) && (best!=addr)) {
if(dyn->next[i]) {
if(dyn->next[i]<addr) { // remove the address, it's before current address
dyn->next[i] = 0;
} else {
if((dyn->next[i]<best) || !best)
best = dyn->next[i];
while(i<dyn->next_sz) {
uintptr_t next = dyn->next[i];
if(!next || next<addr) {
if(next) {
khint_t k = kh_get(nextset, khnextset, next);
if(k != kh_end(khnextset))
kh_del(nextset, khnextset, k);
}
dyn->next[i] = dyn->next[--dyn->next_sz];
continue;
}
if((next<best) || !best)
best = next;
++i;
}
return best;
Expand Down Expand Up @@ -472,6 +473,9 @@ dynablock_t* FillBlock64(uintptr_t addr, int is32bits, int inst_max, int is_new,
// init the helper
dynarec_native_t helper = {0};
dynarec_native_t* dyn = &helper;
if(!khnextset)
khnextset = kh_init(nextset);
kh_clear(nextset, khnextset);
#ifdef GDBJIT
helper.gdbjit_block = box_calloc(1, sizeof(gdbjit_block_t));
#endif
Expand Down
Loading