l3-ENSL/dendrobates-t-azureus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix function detection on i9-9900

Browse Source
This commit is contained in:
GuillaumeDIDIER 2020-08-05 11:12:10 +02:00
parent f3220fdfa3
commit b458204f79
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cache_utils/src/complex_addressing.rs
View File

@ -55,7 +55,7 @@ const CRYSTAL_WELL_FUNCTIONS: [usize; 2] = [
/// function known to be used on core i9-9900 /// function known to be used on core i9-9900
#[allow(non_upper_case_globals)] #[allow(non_upper_case_globals)]
const KABYLAKE_i9_FUNCTIONS: [usize; 4] = [ const COFFEELAKE_R_i9_FUNCTIONS: [usize; 4] = [
0b0000_1111_1111_1101_0101_1101_0101_0001_000000, 0b0000_1111_1111_1101_0101_1101_0101_0001_000000,
0b0000_0110_1111_1011_1010_1100_0100_1000_000000, 0b0000_0110_1111_1011_1010_1100_0100_1000_000000,
0b0000_1111_1110_0001_1111_1100_1011_0000_000000, 0b0000_1111_1110_0001_1111_1100_1011_0000_000000,
@ -80,11 +80,17 @@ pub fn cache_slicing(
} }
match uarch { match uarch {
MicroArchitecture::Skylake | MicroArchitecture::CoffeeLake => { MicroArchitecture::KabyLake | MicroArchitecture::Skylake => {
ComplexAddressing(&SANDYBRIDGE_TO_SKYLAKE_FUNCTIONS[0..((trailing_zeros + 1) as usize)]) ComplexAddressing(&SANDYBRIDGE_TO_SKYLAKE_FUNCTIONS[0..((trailing_zeros + 1) as usize)])
} }
MicroArchitecture::KabyLake => { MicroArchitecture::CoffeeLake => {
ComplexAddressing(&KABYLAKE_i9_FUNCTIONS[0..((trailing_zeros + 1) as usize)]) if family_model_display == 0x6_9E {
ComplexAddressing(&COFFEELAKE_R_i9_FUNCTIONS[0..((trailing_zeros + 1) as usize)])
} else {
ComplexAddressing(
&SANDYBRIDGE_TO_SKYLAKE_FUNCTIONS[0..((trailing_zeros + 1) as usize)],
)
}
} }
MicroArchitecture::SandyBridge MicroArchitecture::SandyBridge
| MicroArchitecture::HaswellE | MicroArchitecture::HaswellE