Skip to content

Commit e094a1a

Browse files
bors[bot]taiki-e
andauthored
Merge #967
967: CachePadded: Use 32-byte alignment on riscv32/sparc/hexagon, 16-byte alignment on m68k r=taiki-e a=taiki-e - riscv32 is assumed not to exceed the cache line size of riscv64. - sparc, hexagon, and m68k's cache line sizes are from Linux kernel's __cacheline_aligned ([SMP_CACHE_BYTES, or L1_CACHE_BYTES if SMP_CACHE_BYTES is not set](https://github.com/torvalds/linux/blob/3516bd729358a2a9b090c1905bd2a3fa926e24c6/include/linux/cache.h)). Co-authored-by: Taiki Endo <[email protected]>
2 parents 20c973e + d49a0f8 commit e094a1a

File tree

1 file changed

+22
-3
lines changed

1 file changed

+22
-3
lines changed

crossbeam-utils/src/cache_padded.rs

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ use core::ops::{Deref, DerefMut};
1414
/// Cache lines are assumed to be N bytes long, depending on the architecture:
1515
///
1616
/// * On x86-64, aarch64, and powerpc64, N = 128.
17-
/// * On arm, mips, mips64, and riscv64, N = 32.
17+
/// * On arm, mips, mips64, riscv32, riscv64, sparc, and hexagon, N = 32.
18+
/// * On m68k, N = 16.
1819
/// * On s390x, N = 256.
1920
/// * On all others, N = 64.
2021
///
@@ -83,33 +84,47 @@ use core::ops::{Deref, DerefMut};
8384
),
8485
repr(align(128))
8586
)]
86-
// arm, mips, mips64, and riscv64 have 32-byte cache line size.
87+
// arm, mips, mips64, riscv64, sparc, and hexagon have 32-byte cache line size.
8788
//
8889
// Sources:
8990
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_arm.go#L7
9091
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mips.go#L7
9192
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mipsle.go#L7
9293
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mips64x.go#L9
9394
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_riscv64.go#L7
95+
// - https://github.com/torvalds/linux/blob/3516bd729358a2a9b090c1905bd2a3fa926e24c6/arch/sparc/include/asm/cache.h#L17
96+
// - https://github.com/torvalds/linux/blob/3516bd729358a2a9b090c1905bd2a3fa926e24c6/arch/hexagon/include/asm/cache.h#L12
97+
//
98+
// riscv32 is assumed not to exceed the cache line size of riscv64.
9499
#[cfg_attr(
95100
any(
96101
target_arch = "arm",
97102
target_arch = "mips",
98103
target_arch = "mips64",
104+
target_arch = "riscv32",
99105
target_arch = "riscv64",
106+
target_arch = "sparc",
107+
target_arch = "hexagon",
100108
),
101109
repr(align(32))
102110
)]
111+
// m68k has 16-byte cache line size.
112+
//
113+
// Sources:
114+
// - https://github.com/torvalds/linux/blob/3516bd729358a2a9b090c1905bd2a3fa926e24c6/arch/m68k/include/asm/cache.h#L9
115+
#[cfg_attr(target_arch = "m68k", repr(align(16)))]
103116
// s390x has 256-byte cache line size.
104117
//
105118
// Sources:
106119
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_s390x.go#L7
120+
// - https://github.com/torvalds/linux/blob/3516bd729358a2a9b090c1905bd2a3fa926e24c6/arch/s390/include/asm/cache.h#L13
107121
#[cfg_attr(target_arch = "s390x", repr(align(256)))]
108-
// x86 and wasm have 64-byte cache line size.
122+
// x86, wasm, and sparc64 have 64-byte cache line size.
109123
//
110124
// Sources:
111125
// - https://github.com/golang/go/blob/dda2991c2ea0c5914714469c4defc2562a907230/src/internal/cpu/cpu_x86.go#L9
112126
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_wasm.go#L7
127+
// - https://github.com/torvalds/linux/blob/3516bd729358a2a9b090c1905bd2a3fa926e24c6/arch/sparc/include/asm/cache.h#L19
113128
//
114129
// All others are assumed to have 64-byte cache line size.
115130
#[cfg_attr(
@@ -120,7 +135,11 @@ use core::ops::{Deref, DerefMut};
120135
target_arch = "arm",
121136
target_arch = "mips",
122137
target_arch = "mips64",
138+
target_arch = "riscv32",
123139
target_arch = "riscv64",
140+
target_arch = "sparc",
141+
target_arch = "hexagon",
142+
target_arch = "m68k",
124143
target_arch = "s390x",
125144
)),
126145
repr(align(64))

0 commit comments

Comments
 (0)