diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common global trie for subtems (seems to be working correctly !)

Browse Source
This commit is contained in:
Ricardo Rocha 2010-04-05 03:34:02 +01:00
parent 9c3bb73bab
commit ab8fee4e08
5 changed files with 482 additions and 980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OPTYap/opt.config.h
View File

@ -54,7 +54,6 @@
/*********************************************************** /***********************************************************
** support global trie ? (optional, define one) ** ** support global trie ? (optional, define one) **
***********************************************************/ ***********************************************************/
/* #define GLOBAL_TRIE_FOR_CALLS_ANSWERS 1 */
/* #define GLOBAL_TRIE_FOR_TERMS 1 */ /* #define GLOBAL_TRIE_FOR_TERMS 1 */
/* #define GLOBAL_TRIE_FOR_SUBTERMS 1 */ /* #define GLOBAL_TRIE_FOR_SUBTERMS 1 */
@ -190,17 +189,12 @@
#if defined(BFZ_TRAIL_SCHEME) && defined(BBREG_TRAIL_SCHEME) #if defined(BFZ_TRAIL_SCHEME) && defined(BBREG_TRAIL_SCHEME)
#error Do not define multiple trail schemes #error Do not define multiple trail schemes
#endif /* BFZ_TRAIL_SCHEME && BBREG_TRAIL_SCHEME */ #endif /* BFZ_TRAIL_SCHEME && BBREG_TRAIL_SCHEME */
#if defined(GLOBAL_TRIE_FOR_CALLS_ANSWERS)
#if defined(GLOBAL_TRIE_FOR_TERMS) || defined(GLOBAL_TRIE_FOR_SUBTERMS)
#error Do not define multiple global trie schemes
#endif /* GLOBAL_TRIE_FOR_TERMS || GLOBAL_TRIE_FOR_SUBTERMS */
#endif /* GLOBAL_TRIE_FOR_CALLS_ANSWERS */
#if defined(GLOBAL_TRIE_FOR_TERMS) && defined(GLOBAL_TRIE_FOR_SUBTERMS) #if defined(GLOBAL_TRIE_FOR_TERMS) && defined(GLOBAL_TRIE_FOR_SUBTERMS)
#error Do not define multiple global trie schemes #error Do not define multiple global trie schemes
#endif /* GLOBAL_TRIE_FOR_TERMS && GLOBAL_TRIE_FOR_SUBTERMS */ #endif /* GLOBAL_TRIE_FOR_TERMS && GLOBAL_TRIE_FOR_SUBTERMS */
#if defined(GLOBAL_TRIE_FOR_CALLS_ANSWERS) || defined(GLOBAL_TRIE_FOR_TERMS) || defined(GLOBAL_TRIE_FOR_SUBTERMS) #if defined(GLOBAL_TRIE_FOR_TERMS) || defined(GLOBAL_TRIE_FOR_SUBTERMS)
#define GLOBAL_TRIE #define GLOBAL_TRIE
#endif /* GLOBAL_TRIE_FOR_CALLS_ANSWERS || GLOBAL_TRIE_FOR_TERMS || GLOBAL_TRIE_FOR_SUBTERMS */ #endif /* GLOBAL_TRIE_FOR_TERMS || GLOBAL_TRIE_FOR_SUBTERMS */
#endif /* TABLING */ #endif /* TABLING */
#if defined(YAPOR) && defined(TABLING) #if defined(YAPOR) && defined(TABLING)
@ -239,7 +233,6 @@
#undef BBREG_TRAIL_SCHEME #undef BBREG_TRAIL_SCHEME
#undef TABLING_EARLY_COMPLETION #undef TABLING_EARLY_COMPLETION
#undef TRIE_COMPACT_PAIRS #undef TRIE_COMPACT_PAIRS
#undef GLOBAL_TRIE_FOR_CALLS_ANSWERS
#undef GLOBAL_TRIE_FOR_TERMS #undef GLOBAL_TRIE_FOR_TERMS
#undef GLOBAL_TRIE_FOR_SUBTERMS #undef GLOBAL_TRIE_FOR_SUBTERMS
#undef DETERMINISTIC_TABLING #undef DETERMINISTIC_TABLING

102
OPTYap/tab.macros.h
View File

@ -227,48 +227,32 @@ static inline tg_sol_fr_ptr CUT_prune_tg_solution_frames(tg_sol_fr_ptr, int);
#define TrNode_init_lock_field(NODE) #define TrNode_init_lock_field(NODE)
#endif /* TABLE_LOCK_AT_NODE_LEVEL */ #endif /* TABLE_LOCK_AT_NODE_LEVEL */
#ifdef GLOBAL_TRIE #define new_table_entry(TAB_ENT, PRED_ENTRY, ATOM, ARITY) \
#define INCREMENT_GLOBAL_TRIE_REFS(NODE) \ { register sg_node_ptr sg_node; \
{ register gt_node_ptr gt_node = (gt_node_ptr) (NODE); \ new_subgoal_trie_node(sg_node, 0, NULL, NULL, NULL); \
TrNode_child(gt_node) = (gt_node_ptr) ((unsigned long int) TrNode_child(gt_node) + 1); \ ALLOC_TABLE_ENTRY(TAB_ENT); \
} TabEnt_init_lock_field(TAB_ENT); \
#define DECREMENT_GLOBAL_TRIE_REFS(NODE) \ TabEnt_pe(TAB_ENT) = PRED_ENTRY; \
{ register gt_node_ptr gt_node = (gt_node_ptr) (NODE); \ TabEnt_atom(TAB_ENT) = ATOM; \
TrNode_child(gt_node) = (gt_node_ptr) ((unsigned long int) TrNode_child(gt_node) - 1); \ TabEnt_arity(TAB_ENT) = ARITY; \
if (TrNode_child(gt_node) == 0) \ TabEnt_mode(TAB_ENT) = 0; \
free_global_trie_branch(gt_node); \ TabEnt_subgoal_trie(TAB_ENT) = sg_node; \
} TabEnt_hash_chain(TAB_ENT) = NULL; \
#else TabEnt_next(TAB_ENT) = GLOBAL_root_tab_ent; \
#define INCREMENT_GLOBAL_TRIE_REFS(NODE) GLOBAL_root_tab_ent = TAB_ENT; \
#define DECREMENT_GLOBAL_TRIE_REFS(NODE)
#endif /* GLOBAL_TRIE */
#define new_table_entry(TAB_ENT, PRED_ENTRY, ATOM, ARITY) \
{ register sg_node_ptr sg_node; \
new_root_subgoal_trie_node(sg_node); \
ALLOC_TABLE_ENTRY(TAB_ENT); \
TabEnt_init_lock_field(TAB_ENT); \
TabEnt_pe(TAB_ENT) = PRED_ENTRY; \
TabEnt_atom(TAB_ENT) = ATOM; \
TabEnt_arity(TAB_ENT) = ARITY; \
TabEnt_mode(TAB_ENT) = 0; \
TabEnt_subgoal_trie(TAB_ENT) = sg_node; \
TabEnt_hash_chain(TAB_ENT) = NULL; \
TabEnt_next(TAB_ENT) = GLOBAL_root_tab_ent; \
GLOBAL_root_tab_ent = TAB_ENT; \
} }
#define new_subgoal_frame(SG_FR, CODE) \ #define new_subgoal_frame(SG_FR, CODE) \
{ register ans_node_ptr ans_node; \ { register ans_node_ptr ans_node; \
new_root_answer_trie_node(ans_node); \ new_answer_trie_node(ans_node, 0, 0, NULL, NULL, NULL); \
ALLOC_SUBGOAL_FRAME(SG_FR); \ ALLOC_SUBGOAL_FRAME(SG_FR); \
INIT_LOCK(SgFr_lock(SG_FR)); \ INIT_LOCK(SgFr_lock(SG_FR)); \
SgFr_code(SG_FR) = CODE; \ SgFr_code(SG_FR) = CODE; \
SgFr_state(SG_FR) = ready; \ SgFr_state(SG_FR) = ready; \
SgFr_hash_chain(SG_FR) = NULL; \ SgFr_hash_chain(SG_FR) = NULL; \
SgFr_answer_trie(SG_FR) = ans_node; \ SgFr_answer_trie(SG_FR) = ans_node; \
SgFr_first_answer(SG_FR) = NULL; \ SgFr_first_answer(SG_FR) = NULL; \
SgFr_last_answer(SG_FR) = NULL; \ SgFr_last_answer(SG_FR) = NULL; \
} }
#define init_subgoal_frame(SG_FR) \ #define init_subgoal_frame(SG_FR) \
{ SgFr_init_yapor_fields(SG_FR); \ { SgFr_init_yapor_fields(SG_FR); \
@ -309,33 +293,21 @@ static inline tg_sol_fr_ptr CUT_prune_tg_solution_frames(tg_sol_fr_ptr, int);
memcpy(SuspFr_local_start(SUSP_FR), SuspFr_local_reg(SUSP_FR), B_SIZE); \ memcpy(SuspFr_local_start(SUSP_FR), SuspFr_local_reg(SUSP_FR), B_SIZE); \
memcpy(SuspFr_trail_start(SUSP_FR), SuspFr_trail_reg(SUSP_FR), TR_SIZE) memcpy(SuspFr_trail_start(SUSP_FR), SuspFr_trail_reg(SUSP_FR), TR_SIZE)
#define new_root_subgoal_trie_node(NODE) \ #define new_subgoal_trie_node(NODE, ENTRY, CHILD, PARENT, NEXT) \
ALLOC_SUBGOAL_TRIE_NODE(NODE); \ ALLOC_SUBGOAL_TRIE_NODE(NODE); \
init_subgoal_trie_node(NODE, 0, NULL, NULL, NULL) TrNode_entry(NODE) = ENTRY; \
#define new_subgoal_trie_node(NODE, ENTRY, CHILD, PARENT, NEXT) \ TrNode_init_lock_field(NODE); \
INCREMENT_GLOBAL_TRIE_REFS(ENTRY); \ TrNode_child(NODE) = CHILD; \
ALLOC_SUBGOAL_TRIE_NODE(NODE); \ TrNode_parent(NODE) = PARENT; \
init_subgoal_trie_node(NODE, ENTRY, CHILD, PARENT, NEXT)
#define init_subgoal_trie_node(NODE, ENTRY, CHILD, PARENT, NEXT) \
TrNode_entry(NODE) = ENTRY; \
TrNode_init_lock_field(NODE); \
TrNode_child(NODE) = CHILD; \
TrNode_parent(NODE) = PARENT; \
TrNode_next(NODE) = NEXT TrNode_next(NODE) = NEXT
#define new_root_answer_trie_node(NODE) \ #define new_answer_trie_node(NODE, INSTR, ENTRY, CHILD, PARENT, NEXT) \
ALLOC_ANSWER_TRIE_NODE(NODE); \ ALLOC_ANSWER_TRIE_NODE(NODE); \
init_answer_trie_node(NODE, 0, 0, NULL, NULL, NULL) TrNode_instr(NODE) = INSTR; \
#define new_answer_trie_node(NODE, INSTR, ENTRY, CHILD, PARENT, NEXT) \ TrNode_entry(NODE) = ENTRY; \
INCREMENT_GLOBAL_TRIE_REFS(ENTRY); \ TrNode_init_lock_field(NODE); \
ALLOC_ANSWER_TRIE_NODE(NODE); \ TrNode_child(NODE) = CHILD; \
init_answer_trie_node(NODE, INSTR, ENTRY, CHILD, PARENT, NEXT) TrNode_parent(NODE) = PARENT; \
#define init_answer_trie_node(NODE, INSTR, ENTRY, CHILD, PARENT, NEXT) \
TrNode_instr(NODE) = INSTR; \
TrNode_entry(NODE) = ENTRY; \
TrNode_init_lock_field(NODE); \
TrNode_child(NODE) = CHILD; \
TrNode_parent(NODE) = PARENT; \
TrNode_next(NODE) = NEXT TrNode_next(NODE) = NEXT
#define new_global_trie_node(NODE, ENTRY, CHILD, PARENT, NEXT) \ #define new_global_trie_node(NODE, ENTRY, CHILD, PARENT, NEXT) \

1341
OPTYap/tab.tries.c
View File

File diff suppressed because it is too large Load Diff

6
OPTYap/tab.tries.i
View File

@ -15,6 +15,12 @@
** Macros ** ** Macros **
*********************/ *********************/
#undef NEW_SUBGOAL_TRIE_NODE
#undef NEW_ANSWER_TRIE_NODE
#undef NEW_GLOBAL_TRIE_NODE
#undef LOCK_NODE
#undef UNLOCK_NODE
#ifdef IS_GLOBAL_TRIE_REFERENCE #ifdef IS_GLOBAL_TRIE_REFERENCE
#define NEW_SUBGOAL_TRIE_NODE(NODE, ENTRY, CHILD, PARENT, NEXT) \ #define NEW_SUBGOAL_TRIE_NODE(NODE, ENTRY, CHILD, PARENT, NEXT) \
INCREMENT_GLOBAL_TRIE_REFERENCE(ENTRY); \ INCREMENT_GLOBAL_TRIE_REFERENCE(ENTRY); \

2
OPTYap/tab.tries.insts.i
View File

@ -1400,7 +1400,7 @@
t_dbl[1] = *++aux_stack_ptr; t_dbl[1] = *++aux_stack_ptr;
#else /* SIZEOF_DOUBLE == SIZEOF_INT_P */ #else /* SIZEOF_DOUBLE == SIZEOF_INT_P */
heap_arity -= 2; heap_arity -= 2;
*t_dbl = *++aux_stack_ptr; t_dbl[0] = *++aux_stack_ptr;
#endif /* SIZEOF_DOUBLE x SIZEOF_INT_P */ #endif /* SIZEOF_DOUBLE x SIZEOF_INT_P */
++aux_stack_ptr; /* jump the float/longint extension mark */ ++aux_stack_ptr; /* jump the float/longint extension mark */
t = MkFloatTerm(dbl); t = MkFloatTerm(dbl);