stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8077843: adlc: allow nodes that use TEMP inputs in expand rules

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Goetz Lindenmaier 2015-04-15 14:51:56 +02:00
parent 34eda6d782
commit 22425d93ca
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hotspot/src/share/vm/adlc/output_c.cpp
View File

@ -1505,8 +1505,8 @@ void ArchDesc::defineExpand(FILE *fp, InstructForm *node) {
// Iterate over the instructions 'node' expands into // Iterate over the instructions 'node' expands into
ExpandRule *expand = node->_exprule; ExpandRule *expand = node->_exprule;
NameAndList *expand_instr = NULL; NameAndList *expand_instr = NULL;
for(expand->reset_instructions(); for (expand->reset_instructions();
(expand_instr = expand->iter_instructions()) != NULL; cnt++) { (expand_instr = expand->iter_instructions()) != NULL; cnt++) {
new_id = expand_instr->name(); new_id = expand_instr->name();
InstructForm* expand_instruction = (InstructForm*)globalAD->globalNames()[new_id]; InstructForm* expand_instruction = (InstructForm*)globalAD->globalNames()[new_id];
@ -1517,30 +1517,25 @@ void ArchDesc::defineExpand(FILE *fp, InstructForm *node) {
continue; continue;
} }
if (expand_instruction->has_temps()) {
globalAD->syntax_err(node->_linenum, "In %s: expand rules using instructs with TEMPs aren't supported: %s",
node->_ident, new_id);
}
// Build the node for the instruction // Build the node for the instruction
fprintf(fp,"\n %sNode *n%d = new %sNode();\n", new_id, cnt, new_id); fprintf(fp,"\n %sNode *n%d = new %sNode();\n", new_id, cnt, new_id);
// Add control edge for this node // Add control edge for this node
fprintf(fp," n%d->add_req(_in[0]);\n", cnt); fprintf(fp," n%d->add_req(_in[0]);\n", cnt);
// Build the operand for the value this node defines. // Build the operand for the value this node defines.
Form *form = (Form*)_globalNames[new_id]; Form *form = (Form*)_globalNames[new_id];
assert( form, "'new_id' must be a defined form name"); assert(form, "'new_id' must be a defined form name");
// Grab the InstructForm for the new instruction // Grab the InstructForm for the new instruction
new_inst = form->is_instruction(); new_inst = form->is_instruction();
assert( new_inst, "'new_id' must be an instruction name"); assert(new_inst, "'new_id' must be an instruction name");
if( node->is_ideal_if() && new_inst->is_ideal_if() ) { if (node->is_ideal_if() && new_inst->is_ideal_if()) {
fprintf(fp, " ((MachIfNode*)n%d)->_prob = _prob;\n",cnt); fprintf(fp, " ((MachIfNode*)n%d)->_prob = _prob;\n", cnt);
fprintf(fp, " ((MachIfNode*)n%d)->_fcnt = _fcnt;\n",cnt); fprintf(fp, " ((MachIfNode*)n%d)->_fcnt = _fcnt;\n", cnt);
} }
if( node->is_ideal_fastlock() && new_inst->is_ideal_fastlock() ) { if (node->is_ideal_fastlock() && new_inst->is_ideal_fastlock()) {
fprintf(fp, " ((MachFastLockNode*)n%d)->_counters = _counters;\n",cnt); fprintf(fp, " ((MachFastLockNode*)n%d)->_counters = _counters;\n", cnt);
fprintf(fp, " ((MachFastLockNode*)n%d)->_rtm_counters = _rtm_counters;\n",cnt); fprintf(fp, " ((MachFastLockNode*)n%d)->_rtm_counters = _rtm_counters;\n", cnt);
fprintf(fp, " ((MachFastLockNode*)n%d)->_stack_rtm_counters = _stack_rtm_counters;\n",cnt); fprintf(fp, " ((MachFastLockNode*)n%d)->_stack_rtm_counters = _stack_rtm_counters;\n", cnt);
} }
// Fill in the bottom_type where requested // Fill in the bottom_type where requested