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

8259777: Incorrect predication condition generated by ADLC

Browse Source 
Reviewed-by: vlivanov
This commit is contained in:
Jatin Bhateja 2021-01-15 15:03:04 +00:00
parent bbac91a4b4
commit bcf20a0dcc
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hotspot/share/adlc/formssel.cpp
View File

@ -1520,6 +1520,7 @@ Predicate *InstructForm::build_predicate() {
for( DictI i(&names); i.test(); ++i ) { for( DictI i(&names); i.test(); ++i ) {
uintptr_t cnt = (uintptr_t)i._value; uintptr_t cnt = (uintptr_t)i._value;
if( cnt > 1 ) { // Need a predicate at all? if( cnt > 1 ) { // Need a predicate at all?
int path_bitmask = 0;
assert( cnt == 2, "Unimplemented" ); assert( cnt == 2, "Unimplemented" );
// Handle many pairs // Handle many pairs
if( first ) first=0; if( first ) first=0;
@ -1530,10 +1531,10 @@ Predicate *InstructForm::build_predicate() {
// Add predicate to working buffer // Add predicate to working buffer
sprintf(s,"/*%s*/(",(char*)i._key); sprintf(s,"/*%s*/(",(char*)i._key);
s += strlen(s); s += strlen(s);
mnode->build_instr_pred(s,(char*)i._key,0); mnode->build_instr_pred(s,(char*)i._key, 0, path_bitmask, 0);
s += strlen(s); s += strlen(s);
strcpy(s," == "); s += strlen(s); strcpy(s," == "); s += strlen(s);
mnode->build_instr_pred(s,(char*)i._key,1); mnode->build_instr_pred(s,(char*)i._key, 1, path_bitmask, 0);
s += strlen(s); s += strlen(s);
strcpy(s,")"); s += strlen(s); strcpy(s,")"); s += strlen(s);
} }
@ -3417,21 +3418,35 @@ void MatchNode::count_instr_names( Dict &names ) {
//------------------------------build_instr_pred------------------------------- //------------------------------build_instr_pred-------------------------------
// Build a path to 'name' in buf. Actually only build if cnt is zero, so we // Build a path to 'name' in buf. Actually only build if cnt is zero, so we
// can skip some leading instances of 'name'. // can skip some leading instances of 'name'.
int MatchNode::build_instr_pred( char *buf, const char *name, int cnt ) { int MatchNode::build_instr_pred( char *buf, const char *name, int cnt, int path_bitmask, int level) {
if( _lChild ) { if( _lChild ) {
if( !cnt ) strcpy( buf, "_kids[0]->" ); cnt = _lChild->build_instr_pred(buf, name, cnt, path_bitmask, level+1);
cnt = _lChild->build_instr_pred( buf+strlen(buf), name, cnt ); if( cnt < 0 ) {
if( cnt < 0 ) return cnt; // Found it, all done return cnt; // Found it, all done
}
} }
if( _rChild ) { if( _rChild ) {
if( !cnt ) strcpy( buf, "_kids[1]->" ); path_bitmask |= 1 << level;
cnt = _rChild->build_instr_pred( buf+strlen(buf), name, cnt ); cnt = _rChild->build_instr_pred( buf, name, cnt, path_bitmask, level+1);
if( cnt < 0 ) return cnt; // Found it, all done if( cnt < 0 ) {
return cnt; // Found it, all done
}
} }
if( !_lChild && !_rChild ) { // Found a leaf if( !_lChild && !_rChild ) { // Found a leaf
// Wrong name? Give up... // Wrong name? Give up...
if( strcmp(name,_name) ) return cnt; if( strcmp(name,_name) ) return cnt;
if( !cnt ) strcpy(buf,"_leaf"); if( !cnt ) {
for(int i = 0; i < level; i++) {
int kid = path_bitmask & (1 << i);
if (0 == kid) {
strcpy( buf, "_kids[0]->" );
} else {
strcpy( buf, "_kids[1]->" );
}
buf += 10;
}
strcpy( buf, "_leaf" );
}
return cnt-1; return cnt-1;
} }
return cnt; return cnt;

2
src/hotspot/share/adlc/formssel.hpp
View File

@ -969,7 +969,7 @@ public:
// Help build instruction predicates. Search for operand names. // Help build instruction predicates. Search for operand names.
void count_instr_names( Dict &names ); void count_instr_names( Dict &names );
int build_instr_pred( char *buf, const char *name, int cnt ); int build_instr_pred( char *buf, const char *name, int cnt, int path_bitmask, int level);
void build_internalop( ); void build_internalop( );
// Return the name of the operands associated with reducing to this operand: // Return the name of the operands associated with reducing to this operand: