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

8011415: CTW on Sparc: assert(lrg.lo_degree()) failed:

Browse Source 
Increased the LRG AllStack mask size since the previous size was not big enough when compiling huge methods (60k+ nodes)

Reviewed-by: kvn, roland, twisti
This commit is contained in:
Niclas Adlertz 2013-10-11 13:10:22 +02:00
parent b90addac58
commit 9215790d61
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hotspot/src/share/vm/opto/chaitin.hpp
View File

@ -52,6 +52,7 @@ class PhaseChaitin;
class LRG : public ResourceObj { class LRG : public ResourceObj {
friend class VMStructs; friend class VMStructs;
public: public:
static const uint AllStack_size = 0xFFFFF; // This mask size is used to tell that the mask of this LRG supports stack positions
enum { SPILL_REG=29999 }; // Register number of a spilled LRG enum { SPILL_REG=29999 }; // Register number of a spilled LRG
double _cost; // 2 for loads/1 for stores times block freq double _cost; // 2 for loads/1 for stores times block freq
@ -83,11 +84,18 @@ public:
int degree() const { assert( _degree_valid , "" ); return _eff_degree; } int degree() const { assert( _degree_valid , "" ); return _eff_degree; }
// Degree starts not valid and any change to the IFG neighbor // Degree starts not valid and any change to the IFG neighbor
// set makes it not valid. // set makes it not valid.
void set_degree( uint degree ) { _eff_degree = degree; debug_only(_degree_valid = 1;) } void set_degree( uint degree ) {
_eff_degree = degree;
debug_only(_degree_valid = 1;)
assert(!_mask.is_AllStack() || (_mask.is_AllStack() && lo_degree()), "_eff_degree can't be bigger than AllStack_size - _num_regs if the mask supports stack registers");
}
// Made a change that hammered degree // Made a change that hammered degree
void invalid_degree() { debug_only(_degree_valid=0;) } void invalid_degree() { debug_only(_degree_valid=0;) }
// Incrementally modify degree. If it was correct, it should remain correct // Incrementally modify degree. If it was correct, it should remain correct
void inc_degree( uint mod ) { _eff_degree += mod; } void inc_degree( uint mod ) {
_eff_degree += mod;
assert(!_mask.is_AllStack() || (_mask.is_AllStack() && lo_degree()), "_eff_degree can't be bigger than AllStack_size - _num_regs if the mask supports stack registers");
}
// Compute the degree between 2 live ranges // Compute the degree between 2 live ranges
int compute_degree( LRG &l ) const; int compute_degree( LRG &l ) const;
@ -95,9 +103,9 @@ private:
RegMask _mask; // Allowed registers for this LRG RegMask _mask; // Allowed registers for this LRG
uint _mask_size; // cache of _mask.Size(); uint _mask_size; // cache of _mask.Size();
public: public:
int compute_mask_size() const { return _mask.is_AllStack() ? 65535 : _mask.Size(); } int compute_mask_size() const { return _mask.is_AllStack() ? AllStack_size : _mask.Size(); }
void set_mask_size( int size ) { void set_mask_size( int size ) {
assert((size == 65535) || (size == (int)_mask.Size()), ""); assert((size == (int)AllStack_size) || (size == (int)_mask.Size()), "");
_mask_size = size; _mask_size = size;
#ifdef ASSERT #ifdef ASSERT
_msize_valid=1; _msize_valid=1;

2
hotspot/src/share/vm/opto/ifg.cpp
View File

@ -677,7 +677,7 @@ uint PhaseChaitin::build_ifg_physical( ResourceArea *a ) {
} else { // Common case: size 1 bound removal } else { // Common case: size 1 bound removal
if( lrg.mask().Member(r_reg) ) { if( lrg.mask().Member(r_reg) ) {
lrg.Remove(r_reg); lrg.Remove(r_reg);
lrg.set_mask_size(lrg.mask().is_AllStack() ? 65535:old_size-1); lrg.set_mask_size(lrg.mask().is_AllStack() ? LRG::AllStack_size : old_size - 1);
} }
} }
// If 'l' goes completely dry, it must spill. // If 'l' goes completely dry, it must spill.