Mercurial > hg > graal-compiler
annotate src/share/vm/memory/barrierSet.inline.hpp @ 1091:6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
Summary: Introduced a new write_ref_array(HeapWords* start, size_t count) method that does the requisite MemRegion range calculation so (some of the) clients of the erstwhile write_ref_array(MemRegion mr) do not need to worry. This removed all external uses of array_size(), which was also simplified and made private. Asserts were added to catch other possible issues. Further, less essential, fixes stemming from this investigation are deferred to CR 6904516 (to follow shortly in hs17).
Reviewed-by: kvn, coleenp, jmasa
author | ysr |
---|---|
date | Thu, 03 Dec 2009 15:01:57 -0800 |
parents | df6caf649ff7 |
children | 6484c4ee11cb |
rev | line source |
---|---|
0 | 1 /* |
196 | 2 * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | |
20 * CA 95054 USA or visit www.sun.com if you need additional information or | |
21 * have any questions. | |
22 * | |
23 */ | |
24 | |
25 // Inline functions of BarrierSet, which de-virtualize certain | |
845
df6caf649ff7
6700789: G1: Enable use of compressed oops with G1 heaps
ysr
parents:
356
diff
changeset
|
26 // performance-critical calls when the barrier is the most common |
0 | 27 // card-table kind. |
28 | |
845
df6caf649ff7
6700789: G1: Enable use of compressed oops with G1 heaps
ysr
parents:
356
diff
changeset
|
29 template <class T> void BarrierSet::write_ref_field_pre(T* field, oop new_val) { |
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
30 if (kind() == CardTableModRef) { |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
31 ((CardTableModRefBS*)this)->inline_write_ref_field_pre(field, new_val); |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
32 } else { |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
33 write_ref_field_pre_work(field, new_val); |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
34 } |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
35 } |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
36 |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
0
diff
changeset
|
37 void BarrierSet::write_ref_field(void* field, oop new_val) { |
0 | 38 if (kind() == CardTableModRef) { |
39 ((CardTableModRefBS*)this)->inline_write_ref_field(field, new_val); | |
40 } else { | |
41 write_ref_field_work(field, new_val); | |
42 } | |
43 } | |
44 | |
45 void BarrierSet::write_ref_array(MemRegion mr) { | |
1091
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
46 assert((HeapWord*)align_size_down((uintptr_t)mr.start(), HeapWordSize) == mr.start() , "Unaligned start"); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
47 assert((HeapWord*)align_size_up ((uintptr_t)mr.end(), HeapWordSize) == mr.end(), "Unaligned end" ); |
0 | 48 if (kind() == CardTableModRef) { |
49 ((CardTableModRefBS*)this)->inline_write_ref_array(mr); | |
50 } else { | |
51 write_ref_array_work(mr); | |
52 } | |
53 } | |
54 | |
1091
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
55 // count is number of array elements being written |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
56 void BarrierSet::write_ref_array(HeapWord* start, size_t count) { |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
57 assert(count <= (size_t)max_intx, "count too large"); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
58 HeapWord* end = (HeapWord*)((char*)start + (count*heapOopSize)); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
59 // In the case of compressed oops, start and end may potentially be misaligned; |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
60 // so we need to conservatively align the first downward (this is not |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
61 // strictly necessary for current uses, but a case of good hygiene and, |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
62 // if you will, aesthetics) and the second upward (this is essential for |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
63 // current uses) to a HeapWord boundary, so we mark all cards overlapping |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
64 // this write. In the event that this evolves in the future to calling a |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
65 // logging barrier of narrow oop granularity, like the pre-barrier for G1 |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
66 // (mentioned here merely by way of example), we will need to change this |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
67 // interface, much like the pre-barrier one above, so it is "exactly precise" |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
68 // (if i may be allowed the adverbial redundancy for emphasis) and does not |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
69 // include narrow oop slots not included in the original write interval. |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
70 HeapWord* aligned_start = (HeapWord*)align_size_down((uintptr_t)start, HeapWordSize); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
71 HeapWord* aligned_end = (HeapWord*)align_size_up ((uintptr_t)end, HeapWordSize); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
72 // If compressed oops were not being used, these should already be aligned |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
73 assert(UseCompressedOops || (aligned_start == start && aligned_end == end), |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
74 "Expected heap word alignment of start and end"); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
75 #if 0 |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
76 warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT","INTPTR_FORMAT")\t", |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
77 start, count, aligned_start, aligned_end); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
78 #endif |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
79 write_ref_array_work(MemRegion(aligned_start, aligned_end)); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
80 } |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
81 |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
82 |
0 | 83 void BarrierSet::write_region(MemRegion mr) { |
84 if (kind() == CardTableModRef) { | |
85 ((CardTableModRefBS*)this)->inline_write_region(mr); | |
86 } else { | |
87 write_region_work(mr); | |
88 } | |
89 } |