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

8191988: JDK-8190862 work for arch s390

Browse Source 
Cleanup interpreter TLAB code and fix ZeroTLAB

Reviewed-by: mdoerr, goetz
This commit is contained in:
Jean Christophe Beyler 2017-12-20 08:38:20 -08:00
parent 63d41b2e6a
commit 2a8c7a915a
1 changed files with 20 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/hotspot/cpu/s390/templateTable_s390.cpp
View File

@ -3722,7 +3722,6 @@ void TemplateTable::_new() {
Label slow_case; Label slow_case;
Label done; Label done;
Label initialize_header; Label initialize_header;
Label initialize_object; // Including clearing the fields.
Label allocate_shared; Label allocate_shared;
BLOCK_COMMENT("TemplateTable::_new {"); BLOCK_COMMENT("TemplateTable::_new {");
@ -3760,65 +3759,41 @@ void TemplateTable::_new() {
// Allocate the instance // Allocate the instance
// 1) Try to allocate in the TLAB. // 1) Try to allocate in the TLAB.
// 2) If fail and the object is large allocate in the shared Eden. // 2) If the above fails (or is not applicable), go to a slow case
// 3) If the above fails (or is not applicable), go to a slow case
// (creates a new TLAB, etc.). // (creates a new TLAB, etc.).
// Note: compared to other architectures, s390's implementation always goes
// Always go the slow path. See comment above this template. // to the slow path if TLAB is used and fails.
const bool allow_shared_alloc = false;
if (UseTLAB) { if (UseTLAB) {
Register RoldTopValue = RallocatedObject; Register RoldTopValue = RallocatedObject;
Register RnewTopValue = tmp; Register RnewTopValue = tmp;
__ z_lg(RoldTopValue, Address(Z_thread, JavaThread::tlab_top_offset())); __ z_lg(RoldTopValue, Address(Z_thread, JavaThread::tlab_top_offset()));
__ load_address(RnewTopValue, Address(RoldTopValue, Rsize)); __ load_address(RnewTopValue, Address(RoldTopValue, Rsize));
__ z_cg(RnewTopValue, Address(Z_thread, JavaThread::tlab_end_offset())); __ z_cg(RnewTopValue, Address(Z_thread, JavaThread::tlab_end_offset()));
__ z_brh(allow_shared_alloc ? allocate_shared : slow_case); __ z_brh(slow_case);
__ z_stg(RnewTopValue, Address(Z_thread, JavaThread::tlab_top_offset())); __ z_stg(RnewTopValue, Address(Z_thread, JavaThread::tlab_top_offset()));
if (ZeroTLAB) {
// The fields have been already cleared.
__ z_bru(initialize_header);
} else {
// Initialize both the header and fields.
if (allow_shared_alloc) {
__ z_bru(initialize_object);
} else {
// Fallthrough to initialize_object, but assert that it is on fall through path.
prev_instr_address = __ pc();
}
}
}
if (allow_shared_alloc) {
// Allocation in shared Eden not implemented, because sapjvm allocation trace does not allow it.
Unimplemented();
}
if (UseTLAB) {
Register RobjectFields = tmp; Register RobjectFields = tmp;
Register Rzero = Z_R1_scratch; Register Rzero = Z_R1_scratch;
assert(ZeroTLAB || prev_instr_address == __ pc(),
"must not omit jump to initialize_object above, as it is not on the fall through path");
__ clear_reg(Rzero, true /*whole reg*/, false); // Load 0L into Rzero. Don't set CC. __ clear_reg(Rzero, true /*whole reg*/, false); // Load 0L into Rzero. Don't set CC.
// The object is initialized before the header. If the object size is if (!ZeroTLAB) {
// zero, go directly to the header initialization. // The object is initialized before the header. If the object size is
__ bind(initialize_object); // zero, go directly to the header initialization.
__ z_aghi(Rsize, (int)-sizeof(oopDesc)); // Subtract header size, set CC. __ z_aghi(Rsize, (int)-sizeof(oopDesc)); // Subtract header size, set CC.
__ z_bre(initialize_header); // Jump if size of fields is zero. __ z_bre(initialize_header); // Jump if size of fields is zero.
// Initialize object fields. // Initialize object fields.
// See documentation for MVCLE instruction!!! // See documentation for MVCLE instruction!!!
assert(RobjectFields->encoding() % 2 == 0, "RobjectFields must be an even register"); assert(RobjectFields->encoding() % 2 == 0, "RobjectFields must be an even register");
assert(Rsize->encoding() == (RobjectFields->encoding()+1), assert(Rsize->encoding() == (RobjectFields->encoding()+1),
"RobjectFields and Rsize must be a register pair"); "RobjectFields and Rsize must be a register pair");
assert(Rzero->encoding() % 2 == 1, "Rzero must be an odd register"); assert(Rzero->encoding() % 2 == 1, "Rzero must be an odd register");
// Set Rzero to 0 and use it as src length, then mvcle will copy nothing // Set Rzero to 0 and use it as src length, then mvcle will copy nothing
// and fill the object with the padding value 0. // and fill the object with the padding value 0.
__ add2reg(RobjectFields, sizeof(oopDesc), RallocatedObject); __ add2reg(RobjectFields, sizeof(oopDesc), RallocatedObject);
__ move_long_ext(RobjectFields, as_Register(Rzero->encoding() - 1), 0); __ move_long_ext(RobjectFields, as_Register(Rzero->encoding() - 1), 0);
}
// Initialize object header only. // Initialize object header only.
__ bind(initialize_header); __ bind(initialize_header);