1.1 --- a/src/cpu/x86/vm/vm_version_x86.cpp Tue Aug 16 11:53:57 2011 -0700
1.2 +++ b/src/cpu/x86/vm/vm_version_x86.cpp Tue Aug 16 16:59:46 2011 -0700
1.3 @@ -557,14 +557,16 @@
1.4 if( !supports_sse() && supports_3dnow_prefetch() ) AllocatePrefetchInstr = 3;
1.5
1.6 // Allocation prefetch settings
1.7 - intx cache_line_size = L1_data_cache_line_size();
1.8 + intx cache_line_size = prefetch_data_size();
1.9 if( cache_line_size > AllocatePrefetchStepSize )
1.10 AllocatePrefetchStepSize = cache_line_size;
1.11 - if( FLAG_IS_DEFAULT(AllocatePrefetchLines) )
1.12 - AllocatePrefetchLines = 3; // Optimistic value
1.13 +
1.14 assert(AllocatePrefetchLines > 0, "invalid value");
1.15 - if( AllocatePrefetchLines < 1 ) // set valid value in product VM
1.16 - AllocatePrefetchLines = 1; // Conservative value
1.17 + if( AllocatePrefetchLines < 1 ) // set valid value in product VM
1.18 + AllocatePrefetchLines = 3;
1.19 + assert(AllocateInstancePrefetchLines > 0, "invalid value");
1.20 + if( AllocateInstancePrefetchLines < 1 ) // set valid value in product VM
1.21 + AllocateInstancePrefetchLines = 1;
1.22
1.23 AllocatePrefetchDistance = allocate_prefetch_distance();
1.24 AllocatePrefetchStyle = allocate_prefetch_style();
1.25 @@ -601,10 +603,11 @@
1.26 tty->print_cr("Logical CPUs per core: %u",
1.27 logical_processors_per_package());
1.28 tty->print_cr("UseSSE=%d",UseSSE);
1.29 - tty->print("Allocation: ");
1.30 + tty->print("Allocation");
1.31 if (AllocatePrefetchStyle <= 0 || UseSSE == 0 && !supports_3dnow_prefetch()) {
1.32 - tty->print_cr("no prefetching");
1.33 + tty->print_cr(": no prefetching");
1.34 } else {
1.35 + tty->print(" prefetching: ");
1.36 if (UseSSE == 0 && supports_3dnow_prefetch()) {
1.37 tty->print("PREFETCHW");
1.38 } else if (UseSSE >= 1) {
1.39 @@ -619,9 +622,9 @@
1.40 }
1.41 }
1.42 if (AllocatePrefetchLines > 1) {
1.43 - tty->print_cr(" %d, %d lines with step %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
1.44 + tty->print_cr(" at distance %d, %d lines of %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
1.45 } else {
1.46 - tty->print_cr(" %d, one line", AllocatePrefetchDistance);
1.47 + tty->print_cr(" at distance %d, one line of %d bytes", AllocatePrefetchDistance, AllocatePrefetchStepSize);
1.48 }
1.49 }
1.50
