From dd304211150c7bec86ca646e1760b7a469aa11af Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 19 May 2016 17:48:01 +0000 Subject: [PATCH 1/2] Added tag jdk-9+119 for changeset 45c70a976569 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index c2bf9fb792d..754ebb60e4b 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -521,3 +521,4 @@ b64432bae5271735fd53300b2005b713e98ef411 jdk-9+114 61a214186dae6811dd989e9165e42f7dbf02acde jdk-9+116 88170d3642905b9e6cac03e8efcc976885a7e6da jdk-9+117 9b1075cac08dc836ec32e7b368415cbe3aceaf8c jdk-9+118 +15f3fe264872766bcb205696198f0c1502420e17 jdk-9+119 From 5acfcd36154e31f96980f12513a89bdcf33252c7 Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Thu, 19 May 2016 11:01:38 -0700 Subject: [PATCH 2/2] 8157184: java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java failed with a fatal error Add missing cache_line_size > 0 checks. Reviewed-by: vlivanov, kbarrett --- hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp | 1 + hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp index 8b25bd26c3f..5fe78adb684 100644 --- a/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/macroAssembler_sparc.cpp @@ -4767,6 +4767,7 @@ void MacroAssembler::bis_zeroing(Register to, Register count, Register temp, Lab assert(UseBlockZeroing && VM_Version::has_block_zeroing(), "only works with BIS zeroing"); Register end = count; int cache_line_size = VM_Version::prefetch_data_size(); + assert(cache_line_size > 0, "cache line size should be known for this code"); // Minimum count when BIS zeroing can be used since // it needs membar which is expensive. int block_zero_size = MAX2(cache_line_size*3, (int)BlockZeroingLowLimit); diff --git a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp index f01a5bc867d..88ac31e096d 100644 --- a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp @@ -49,7 +49,7 @@ void VM_Version::initialize() { AllocatePrefetchDistance = allocate_prefetch_distance(); AllocatePrefetchStyle = allocate_prefetch_style(); - if (!has_blk_init()) { + if (!has_blk_init() || cache_line_size <= 0) { if (AllocatePrefetchInstr == 1) { warning("BIS instructions required for AllocatePrefetchInstr 1 unavailable"); FLAG_SET_DEFAULT(AllocatePrefetchInstr, 0); @@ -87,7 +87,7 @@ void VM_Version::initialize() { FLAG_SET_DEFAULT(InteriorEntryAlignment, 4); } if (is_niagara_plus()) { - if (has_blk_init() && UseTLAB && + if (has_blk_init() && (cache_line_size > 0) && UseTLAB && FLAG_IS_DEFAULT(AllocatePrefetchInstr)) { // Use BIS instruction for TLAB allocation prefetch. FLAG_SET_DEFAULT(AllocatePrefetchInstr, 1);