truffle: src/share/vm/opto/ifg.cpp comparison

comparison src/share/vm/opto/ifg.cpp @ 14513:16c705d792be

Merge

author	morris
date	Fri, 28 Feb 2014 08:02:20 -0800
parents	1077c8270209
children	4ca6dc0799b6

comparison

equal deleted inserted replaced

-:7d30d4f37d31
+:16c705d792be
 if (r.overlap(*Matcher::idealreg2regmask[Op_RegI])) {
 int_pressure.lower(lrg, location);
 }
 }
 }
-assert(int_pressure._current_pressure == count_int_pressure(liveout), "the int pressure is incorrect");
+assert(int_pressure.current_pressure() == count_int_pressure(liveout), "the int pressure is incorrect");
-assert(float_pressure._current_pressure == count_float_pressure(liveout), "the float pressure is incorrect");
+assert(float_pressure.current_pressure() == count_float_pressure(liveout), "the float pressure is incorrect");
 }
 /* Go to the first non-phi index in a block */
 static uint first_nonphi_index(Block* b) {
 uint i;
 LRG& lrg = lrgs(lid);
 lrg._area += cost;
 raise_pressure(b, lrg, int_pressure, float_pressure);
 lid = elements.next();
 }
-assert(int_pressure._current_pressure == count_int_pressure(liveout), "the int pressure is incorrect");
+assert(int_pressure.current_pressure() == count_int_pressure(liveout), "the int pressure is incorrect");
-assert(float_pressure._current_pressure == count_float_pressure(liveout), "the float pressure is incorrect");
+assert(float_pressure.current_pressure() == count_float_pressure(liveout), "the float pressure is incorrect");
 }
 /*
 * Remove dead node if it's not used.
 * We only remove projection nodes if the node "defining" the projection is
 * block. If we find a low to high transition, we record it.
 */
 void PhaseChaitin::check_for_high_pressure_transition_at_fatproj(uint& block_reg_pressure, uint location, LRG& lrg, Pressure& pressure, const int op_regtype) {
 RegMask mask_tmp = lrg.mask();
 mask_tmp.AND(*Matcher::idealreg2regmask[op_regtype]);
-// this pressure is only valid at this instruction, i.e. we don't need to lower
+pressure.check_pressure_at_fatproj(location, mask_tmp);
-// the register pressure since the fat proj was never live before (going backwards)
-uint new_pressure = pressure._current_pressure + mask_tmp.Size();
-if (new_pressure > pressure._final_pressure) {
-pressure._final_pressure = new_pressure;
-}
-// if we were at a low pressure and now at the fat proj is at high pressure, record the fat proj location
-// as coming from a low to high (to low again)
-if (pressure._current_pressure <= pressure._high_pressure_limit && new_pressure > pressure._high_pressure_limit) {
-pressure._high_pressure_index = location;
-}
 }
 /*
 * Insure high score for immediate-use spill copies so they get a color.
 * All single-use MachSpillCopy(s) that immediately precede their
 if (liveout->insert(lid)) {
 // Newly live things assumed live from here to top of block
 lrg._area += cost;
 raise_pressure(b, lrg, int_pressure, float_pressure);
-assert(int_pressure._current_pressure == count_int_pressure(liveout), "the int pressure is incorrect");
+assert(int_pressure.current_pressure() == count_int_pressure(liveout), "the int pressure is incorrect");
-assert(float_pressure._current_pressure == count_float_pressure(liveout), "the float pressure is incorrect");
+assert(float_pressure.current_pressure() == count_float_pressure(liveout), "the float pressure is incorrect");
 }
-assert(!(lrg._area < 0.0), "negative spill area" );
+assert(lrg._area >= 0.0, "negative spill area" );
 }
 }
 /*
 * If we run off the top of the block with high pressure just record that the
 * whole block is high pressure. (Even though we might have a transition
-* lower down in the block)
+* later down in the block)
 */
 void PhaseChaitin::check_for_high_pressure_block(Pressure& pressure) {
 // current pressure now means the pressure before the first instruction in the block
 // (since we have stepped through all instructions backwards)
-if (pressure._current_pressure > pressure._high_pressure_limit) {
+if (pressure.current_pressure() > pressure.high_pressure_limit()) {
-pressure._high_pressure_index = 0;
+pressure.set_high_pressure_index_to_block_start();
 }
 }
 /*
 * Compute high pressure indice; avoid landing in the middle of projnodes
 * and set the high pressure index for the block
 */
 void PhaseChaitin::adjust_high_pressure_index(Block* b, uint& block_hrp_index, Pressure& pressure) {
-uint i = pressure._high_pressure_index;
+uint i = pressure.high_pressure_index();
 if (i < b->number_of_nodes() && i < b->end_idx() + 1) {
 Node* cur = b->get_node(i);
 while (cur->is_Proj() || (cur->is_MachNullCheck()) || cur->is_Catch()) {
 cur = b->get_node(--i);
 }
 block->_reg_pressure = 0;
 block->_freg_pressure = 0;
 int inst_count = last_inst - first_inst;
 double cost = (inst_count <= 0) ? 0.0 : block->_freq * double(inst_count);
-assert(!(cost < 0.0), "negative spill cost" );
+assert(cost >= 0.0, "negative spill cost" );
 compute_initial_block_pressure(block, &liveout, int_pressure, float_pressure, cost);
 for (uint location = last_inst; location > 0; location--) {
 Node* n = block->get_node(location);
 // removed from the DEF sight, so LOWER costs here.
 lrg._cost += n->rematerialize() ? 0 : block->_freq;
 if (!liveout.member(lid) && n->Opcode() != Op_SafePoint) {
 if (remove_node_if_not_used(block, location, n, lid, &liveout)) {
-float_pressure._high_pressure_index--;
+float_pressure.lower_high_pressure_index();
-int_pressure._high_pressure_index--;
+int_pressure.lower_high_pressure_index();
 continue;
 }
 if (lrg._fat_proj) {
 check_for_high_pressure_transition_at_fatproj(block->_reg_pressure, location, lrg, int_pressure, Op_RegI);
 check_for_high_pressure_transition_at_fatproj(block->_freg_pressure, location, lrg, float_pressure, Op_RegD);
 }
 } else {
 // A live range ends at its definition, remove the remaining area.
-lrg._area -= cost;
+// If the cost is +Inf (which might happen in extreme cases), the lrg area will also be +Inf,
+// and +Inf - +Inf = NaN. So let's not do that subtraction.
+if (g_isfinite(cost)) {
+lrg._area -= cost;
+}
 assert(lrg._area >= 0.0, "negative spill area" );
 assign_high_score_to_immediate_copies(block, n, lrg, location + 1, last_inst);
 if (liveout.remove(lid)) {
 check_for_high_pressure_block(int_pressure);
 check_for_high_pressure_block(float_pressure);
 adjust_high_pressure_index(block, block->_ihrp_index, int_pressure);
 adjust_high_pressure_index(block, block->_fhrp_index, float_pressure);
 // set the final_pressure as the register pressure for the block
-block->_reg_pressure = int_pressure._final_pressure;
+block->_reg_pressure = int_pressure.final_pressure();
-block->_freg_pressure = float_pressure._final_pressure;
+block->_freg_pressure = float_pressure.final_pressure();
 #ifndef PRODUCT
 // Gather Register Pressure Statistics
 if (PrintOptoStatistics) {
-if (block->_reg_pressure > int_pressure._high_pressure_limit || block->_freg_pressure > float_pressure._high_pressure_limit) {
+if (block->_reg_pressure > int_pressure.high_pressure_limit() || block->_freg_pressure > float_pressure.high_pressure_limit()) {
 _high_pressure++;
 } else {
 _low_pressure++;
 }
 }

Mercurial > hg > truffle

comparison src/share/vm/opto/ifg.cpp @ 14513:16c705d792be