Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8259228: Zero: rewrite (put|get)field from if-else chains to switches
Reviewed-by: aph, coleenp
  • Loading branch information
shipilev committed Mar 5, 2021
1 parent 9730266 commit 75fb7ccf346155398ed79c9d06c5ff42dd2ff1fc
Showing with 132 additions and 78 deletions.
  1. +132 −78 src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
@@ -1636,46 +1636,74 @@ void BytecodeInterpreter::run(interpreterState istate) {
if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
OrderAccess::fence();
}
if (tos_type == atos) {
VERIFY_OOP(obj->obj_field_acquire(field_offset));
SET_STACK_OBJECT(obj->obj_field_acquire(field_offset), -1);
} else if (tos_type == itos) {
SET_STACK_INT(obj->int_field_acquire(field_offset), -1);
} else if (tos_type == ltos) {
SET_STACK_LONG(obj->long_field_acquire(field_offset), 0);
MORE_STACK(1);
} else if (tos_type == btos || tos_type == ztos) {
SET_STACK_INT(obj->byte_field_acquire(field_offset), -1);
} else if (tos_type == ctos) {
SET_STACK_INT(obj->char_field_acquire(field_offset), -1);
} else if (tos_type == stos) {
SET_STACK_INT(obj->short_field_acquire(field_offset), -1);
} else if (tos_type == ftos) {
SET_STACK_FLOAT(obj->float_field_acquire(field_offset), -1);
} else {
SET_STACK_DOUBLE(obj->double_field_acquire(field_offset), 0);
MORE_STACK(1);
switch (tos_type) {
case btos:
case ztos:
SET_STACK_INT(obj->byte_field_acquire(field_offset), -1);
break;
case ctos:
SET_STACK_INT(obj->char_field_acquire(field_offset), -1);
break;
case stos:
SET_STACK_INT(obj->short_field_acquire(field_offset), -1);
break;
case itos:
SET_STACK_INT(obj->int_field_acquire(field_offset), -1);
break;
case ftos:
SET_STACK_FLOAT(obj->float_field_acquire(field_offset), -1);
break;
case ltos:
SET_STACK_LONG(obj->long_field_acquire(field_offset), 0);
MORE_STACK(1);
break;
case dtos:
SET_STACK_DOUBLE(obj->double_field_acquire(field_offset), 0);
MORE_STACK(1);
break;
case atos: {
oop val = obj->obj_field_acquire(field_offset);
VERIFY_OOP(val);
SET_STACK_OBJECT(val, -1);
break;
}
default:
ShouldNotReachHere();
}
} else {
if (tos_type == atos) {
VERIFY_OOP(obj->obj_field(field_offset));
SET_STACK_OBJECT(obj->obj_field(field_offset), -1);
} else if (tos_type == itos) {
SET_STACK_INT(obj->int_field(field_offset), -1);
} else if (tos_type == ltos) {
SET_STACK_LONG(obj->long_field(field_offset), 0);
MORE_STACK(1);
} else if (tos_type == btos || tos_type == ztos) {
SET_STACK_INT(obj->byte_field(field_offset), -1);
} else if (tos_type == ctos) {
SET_STACK_INT(obj->char_field(field_offset), -1);
} else if (tos_type == stos) {
SET_STACK_INT(obj->short_field(field_offset), -1);
} else if (tos_type == ftos) {
SET_STACK_FLOAT(obj->float_field(field_offset), -1);
} else {
SET_STACK_DOUBLE(obj->double_field(field_offset), 0);
MORE_STACK(1);
switch (tos_type) {
case btos:
case ztos:
SET_STACK_INT(obj->byte_field(field_offset), -1);
break;
case ctos:
SET_STACK_INT(obj->char_field(field_offset), -1);
break;
case stos:
SET_STACK_INT(obj->short_field(field_offset), -1);
break;
case itos:
SET_STACK_INT(obj->int_field(field_offset), -1);
break;
case ftos:
SET_STACK_FLOAT(obj->float_field(field_offset), -1);
break;
case ltos:
SET_STACK_LONG(obj->long_field(field_offset), 0);
MORE_STACK(1);
break;
case dtos:
SET_STACK_DOUBLE(obj->double_field(field_offset), 0);
MORE_STACK(1);
break;
case atos: {
oop val = obj->obj_field(field_offset);
VERIFY_OOP(val);
SET_STACK_OBJECT(val, -1);
break;
}
default:
ShouldNotReachHere();
}
}

@@ -1745,49 +1773,75 @@ void BytecodeInterpreter::run(interpreterState istate) {
//
int field_offset = cache->f2_as_index();
if (cache->is_volatile()) {
if (tos_type == itos) {
obj->release_int_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == atos) {
VERIFY_OOP(STACK_OBJECT(-1));
obj->release_obj_field_put(field_offset, STACK_OBJECT(-1));
} else if (tos_type == btos) {
obj->release_byte_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == ztos) {
int bool_field = STACK_INT(-1); // only store LSB
obj->release_byte_field_put(field_offset, (bool_field & 1));
} else if (tos_type == ltos) {
obj->release_long_field_put(field_offset, STACK_LONG(-1));
} else if (tos_type == ctos) {
obj->release_char_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == stos) {
obj->release_short_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == ftos) {
obj->release_float_field_put(field_offset, STACK_FLOAT(-1));
} else {
obj->release_double_field_put(field_offset, STACK_DOUBLE(-1));
switch (tos_type) {
case ztos:
obj->release_byte_field_put(field_offset, (STACK_INT(-1) & 1)); // only store LSB
break;
case btos:
obj->release_byte_field_put(field_offset, STACK_INT(-1));
break;
case ctos:
obj->release_char_field_put(field_offset, STACK_INT(-1));
break;
case stos:
obj->release_short_field_put(field_offset, STACK_INT(-1));
break;
case itos:
obj->release_int_field_put(field_offset, STACK_INT(-1));
break;
case ftos:
obj->release_float_field_put(field_offset, STACK_FLOAT(-1));
break;
case ltos:
obj->release_long_field_put(field_offset, STACK_LONG(-1));
break;
case dtos:
obj->release_double_field_put(field_offset, STACK_DOUBLE(-1));
break;
case atos: {
oop val = STACK_OBJECT(-1);
VERIFY_OOP(val);
obj->release_obj_field_put(field_offset, val);
break;
}
default:
ShouldNotReachHere();
}
OrderAccess::storeload();
} else {
if (tos_type == itos) {
obj->int_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == atos) {
VERIFY_OOP(STACK_OBJECT(-1));
obj->obj_field_put(field_offset, STACK_OBJECT(-1));
} else if (tos_type == btos) {
obj->byte_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == ztos) {
int bool_field = STACK_INT(-1); // only store LSB
obj->byte_field_put(field_offset, (bool_field & 1));
} else if (tos_type == ltos) {
obj->long_field_put(field_offset, STACK_LONG(-1));
} else if (tos_type == ctos) {
obj->char_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == stos) {
obj->short_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == ftos) {
obj->float_field_put(field_offset, STACK_FLOAT(-1));
} else {
obj->double_field_put(field_offset, STACK_DOUBLE(-1));
switch (tos_type) {
case ztos:
obj->byte_field_put(field_offset, (STACK_INT(-1) & 1)); // only store LSB
break;
case btos:
obj->byte_field_put(field_offset, STACK_INT(-1));
break;
case ctos:
obj->char_field_put(field_offset, STACK_INT(-1));
break;
case stos:
obj->short_field_put(field_offset, STACK_INT(-1));
break;
case itos:
obj->int_field_put(field_offset, STACK_INT(-1));
break;
case ftos:
obj->float_field_put(field_offset, STACK_FLOAT(-1));
break;
case ltos:
obj->long_field_put(field_offset, STACK_LONG(-1));
break;
case dtos:
obj->double_field_put(field_offset, STACK_DOUBLE(-1));
break;
case atos: {
oop val = STACK_OBJECT(-1);
VERIFY_OOP(val);
obj->obj_field_put(field_offset, val);
break;
}
default:
ShouldNotReachHere();
}
}

0 comments on commit 75fb7cc

Please sign in to comment.