mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-17 09:10:22 +02:00
make symbol -> opcode lookup faster
* libguile/instructions.c (fetch_instruction_table) (scm_lookup_instruction_by_name): Rework so we lazily load instructions into an array keyed by opcode, and a hash table keyed by symbolic name. Much faster, in this hot spot of compilation. * libguile/vm-engine.c (vm_run): Use malloc instead of scm_gc_malloc, given that we aren't ever going to free this thing. * libguile/vm-expand.h (VM_DEFINE_FUNCTION, VM_DEFINE_LOADER): Rework to always be aliases to VM_DEFINE_INSTRUCTION. (VM_DEFINE_INSTRUCTION): In the table case, update to work with fetch_instruction_table().
This commit is contained in:
Andy Wingo
parent
ef7e18683c
commit
f775e51bce
3 changed files with 72 additions and 50 deletions
|
|
@ -57,16 +57,7 @@ struct scm_instruction {
|
|||
-1 for insns like `call' which can take
|
||||
any number of arguments. */
|
||||
char npush; /* the number of values pushed */
|
||||
};
|
||||
|
||||
static struct scm_instruction scm_instruction_table[] = {
|
||||
#define VM_INSTRUCTION_TO_TABLE 1
|
||||
#include "vm-expand.h"
|
||||
#include "vm-i-system.i"
|
||||
#include "vm-i-scheme.i"
|
||||
#include "vm-i-loader.i"
|
||||
#undef VM_INSTRUCTION_TO_TABLE
|
||||
{scm_op_last}
|
||||
SCM symname; /* filled in later */
|
||||
};
|
||||
|
||||
#define SCM_VALIDATE_LOOKUP_INSTRUCTION(pos, var, cvar) \
|
||||
|
|
@ -76,27 +67,58 @@ static struct scm_instruction scm_instruction_table[] = {
|
|||
} while (0)
|
||||
|
||||
|
||||
static struct scm_instruction*
|
||||
fetch_instruction_table ()
|
||||
{
|
||||
static struct scm_instruction *table = NULL;
|
||||
|
||||
if (SCM_UNLIKELY (!table))
|
||||
{
|
||||
size_t bytes = scm_op_last * sizeof(struct scm_instruction);
|
||||
int i;
|
||||
table = malloc (bytes);
|
||||
memset (table, 0, bytes);
|
||||
#define VM_INSTRUCTION_TO_TABLE 1
|
||||
#include "vm-expand.h"
|
||||
#include "vm-i-system.i"
|
||||
#include "vm-i-scheme.i"
|
||||
#include "vm-i-loader.i"
|
||||
#undef VM_INSTRUCTION_TO_TABLE
|
||||
for (i = 0; i < scm_op_last; i++)
|
||||
{
|
||||
table[i].opcode = i;
|
||||
if (table[i].name)
|
||||
table[i].symname = scm_from_locale_symbol (table[i].name);
|
||||
else
|
||||
table[i].symname = SCM_BOOL_F;
|
||||
}
|
||||
}
|
||||
return table;
|
||||
}
|
||||
|
||||
static struct scm_instruction *
|
||||
scm_lookup_instruction_by_name (SCM name)
|
||||
{
|
||||
struct scm_instruction *ip;
|
||||
char *symbol;
|
||||
static SCM instructions_by_name = SCM_BOOL_F;
|
||||
struct scm_instruction *table = fetch_instruction_table ();
|
||||
SCM op;
|
||||
|
||||
if (SCM_SYMBOLP (name))
|
||||
for (ip = scm_instruction_table; ip->opcode != scm_op_last; ip++)
|
||||
if (SCM_UNLIKELY (SCM_FALSEP (instructions_by_name)))
|
||||
{
|
||||
symbol = scm_to_locale_string (scm_symbol_to_string (name));
|
||||
if ((symbol) && (strcmp (ip->name, symbol) == 0))
|
||||
{
|
||||
free (symbol);
|
||||
return ip;
|
||||
int i;
|
||||
instructions_by_name = scm_make_hash_table (SCM_I_MAKINUM (scm_op_last));
|
||||
for (i = 0; i < scm_op_last; i++)
|
||||
if (scm_is_true (table[i].symname))
|
||||
scm_hashq_set_x (instructions_by_name, table[i].symname,
|
||||
SCM_I_MAKINUM (i));
|
||||
instructions_by_name = scm_permanent_object (instructions_by_name);
|
||||
}
|
||||
|
||||
if (symbol)
|
||||
free (symbol);
|
||||
}
|
||||
op = scm_hashq_ref (instructions_by_name, name, SCM_UNDEFINED);
|
||||
if (SCM_I_INUMP (op))
|
||||
return &table[SCM_I_INUM (op)];
|
||||
|
||||
return 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -109,8 +131,9 @@ SCM_DEFINE (scm_instruction_list, "instruction-list", 0, 0, 0,
|
|||
{
|
||||
SCM list = SCM_EOL;
|
||||
struct scm_instruction *ip;
|
||||
for (ip = scm_instruction_table; ip->opcode != scm_op_last; ip++)
|
||||
list = scm_cons (scm_from_locale_symbol (ip->name), list);
|
||||
for (ip = fetch_instruction_table (); ip->opcode != scm_op_last; ip++)
|
||||
if (ip->name)
|
||||
list = scm_cons (ip->symname, list);
|
||||
return scm_reverse_x (list, SCM_EOL);
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
|
@ -173,18 +196,19 @@ SCM_DEFINE (scm_opcode_to_instruction, "opcode->instruction", 1, 0, 0,
|
|||
"")
|
||||
#define FUNC_NAME s_scm_opcode_to_instruction
|
||||
{
|
||||
struct scm_instruction *ip;
|
||||
int opcode;
|
||||
SCM ret = SCM_BOOL_F;
|
||||
|
||||
SCM_MAKE_VALIDATE (1, op, I_INUMP);
|
||||
opcode = SCM_I_INUM (op);
|
||||
|
||||
for (ip = scm_instruction_table; ip->opcode != scm_op_last; ip++)
|
||||
if (opcode == ip->opcode)
|
||||
return scm_from_locale_symbol (ip->name);
|
||||
if (opcode < scm_op_last)
|
||||
ret = fetch_instruction_table ()[opcode].symname;
|
||||
|
||||
if (scm_is_false (ret))
|
||||
scm_wrong_type_arg_msg (FUNC_NAME, 1, op, "INSTRUCTION_P");
|
||||
return SCM_BOOL_F; /* not reached */
|
||||
|
||||
return ret;
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
|
|
|
|||
|
|
@ -80,8 +80,7 @@ vm_run (SCM vm, SCM program, SCM args)
|
|||
if (SCM_UNLIKELY (!jump_table))
|
||||
{
|
||||
int i;
|
||||
jump_table = scm_gc_malloc (SCM_VM_NUM_INSTRUCTIONS * sizeof(void*),
|
||||
"jump table");
|
||||
jump_table = malloc (SCM_VM_NUM_INSTRUCTIONS * sizeof(void*));
|
||||
for (i = 0; i < SCM_VM_NUM_INSTRUCTIONS; i++)
|
||||
jump_table[i] = &&vm_error_bad_instruction;
|
||||
#define VM_INSTRUCTION_TO_LABEL 1
|
||||
|
|
|
|||
|
|
@ -52,19 +52,24 @@
|
|||
#endif /* not HAVE_LABELS_AS_VALUES */
|
||||
#endif /* VM_LABEL */
|
||||
|
||||
#undef VM_DEFINE_INSTRUCTION
|
||||
#undef VM_DEFINE_FUNCTION
|
||||
#undef VM_DEFINE_LOADER
|
||||
#ifdef VM_INSTRUCTION_TO_TABLE
|
||||
#define VM_DEFINE_FUNCTION(code,tag,name,nargs) \
|
||||
VM_DEFINE_INSTRUCTION(code,tag,name,0,nargs,1)
|
||||
#define VM_DEFINE_LOADER(code,tag,name) \
|
||||
VM_DEFINE_INSTRUCTION(code,tag,name,-1,0,1)
|
||||
|
||||
#undef VM_DEFINE_INSTRUCTION
|
||||
/*
|
||||
* These will go to scm_instruction_table in instructions.c
|
||||
*/
|
||||
#define VM_DEFINE_INSTRUCTION(code,tag,name,len,npop,npush) \
|
||||
{VM_OPCODE (tag), name, len, npop, npush},
|
||||
#define VM_DEFINE_FUNCTION(code,tag,name,nargs) \
|
||||
{VM_OPCODE (tag), name, 0, nargs, 1},
|
||||
#define VM_DEFINE_LOADER(code,tag,name) \
|
||||
{VM_OPCODE (tag), name, -1, 0, 1},
|
||||
#ifdef VM_INSTRUCTION_TO_TABLE
|
||||
#define VM_DEFINE_INSTRUCTION(code_,tag_,name_,len_,npop_,npush_) \
|
||||
table[VM_OPCODE (tag_)].opcode = VM_OPCODE (tag_); \
|
||||
table[VM_OPCODE (tag_)].name = name_; \
|
||||
table[VM_OPCODE (tag_)].len = len_; \
|
||||
table[VM_OPCODE (tag_)].npop = npop_; \
|
||||
table[VM_OPCODE (tag_)].npush = npush_;
|
||||
|
||||
#else
|
||||
#ifdef VM_INSTRUCTION_TO_LABEL
|
||||
|
|
@ -72,8 +77,6 @@
|
|||
* These will go to jump_table in vm_engine.c
|
||||
*/
|
||||
#define VM_DEFINE_INSTRUCTION(code,tag,name,len,npop,npush) jump_table[VM_OPCODE (tag)] = VM_ADDR (tag);
|
||||
#define VM_DEFINE_FUNCTION(code,tag,name,nargs) jump_table[VM_OPCODE (tag)] = VM_ADDR (tag);
|
||||
#define VM_DEFINE_LOADER(code,tag,name) jump_table[VM_OPCODE (tag)] = VM_ADDR (tag);
|
||||
|
||||
#else
|
||||
#ifdef VM_INSTRUCTION_TO_OPCODE
|
||||
|
|
@ -81,16 +84,12 @@
|
|||
* These will go to scm_opcode in instructions.h
|
||||
*/
|
||||
#define VM_DEFINE_INSTRUCTION(code,tag,name,len,npop,npush) VM_OPCODE (tag) = code,
|
||||
#define VM_DEFINE_FUNCTION(code,tag,name,nargs) VM_OPCODE (tag) = code,
|
||||
#define VM_DEFINE_LOADER(code,tag,name) VM_OPCODE (tag) = code,
|
||||
|
||||
#else /* Otherwise */
|
||||
/*
|
||||
* These are directly included in vm_engine.c
|
||||
*/
|
||||
#define VM_DEFINE_INSTRUCTION(code,tag,name,len,npop,npush) VM_TAG (tag)
|
||||
#define VM_DEFINE_FUNCTION(code,tag,name,nargs) VM_TAG (tag)
|
||||
#define VM_DEFINE_LOADER(code,tag,name) VM_TAG (tag)
|
||||
|
||||
#endif /* VM_INSTRUCTION_TO_OPCODE */
|
||||
#endif /* VM_INSTRUCTION_TO_LABEL */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue