derek/pim-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unwanted cache evictions during PIM operation

Browse Source
This commit is contained in:
Derek Christ
2023-12-26 13:03:33 +01:00
parent 329c0191cc
commit dfa773b839
2 changed files with 76 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
pim-os/src/pim/array.rs
View File

@@ -80,31 +80,31 @@ pub trait PimRegion {
fn bank_ptr_mut(&mut self, bank_index: usize) -> *mut f16; fn bank_ptr_mut(&mut self, bank_index: usize) -> *mut f16;
fn execute_instruction_read_single_bank(&self) { fn execute_instruction_read_single_bank(&self) {
for i in (0..Self::OCCUPIED_ROWS).map(|i| i * NUMBER_OF_BANKS) { for i in 0..Self::OCCUPIED_ROWS {
if !cfg!(feature = "cacheless") { if !cfg!(feature = "cacheless") {
self.invalidate_bank(EVEN_BANK_INDEX + i); self.invalidate_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
barrier::dsb(barrier::SY); barrier::dsb(barrier::SY);
} }
// Read from first bank // Read from first bank
self.read_data_bank(EVEN_BANK_INDEX + i); self.read_data_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
barrier::dsb(barrier::SY); barrier::dsb(barrier::SY);
} }
} }
fn execute_instruction_read_dual_bank(&self) { fn execute_instruction_read_dual_bank(&self) {
for i in (0..Self::OCCUPIED_ROWS).map(|i| i * NUMBER_OF_BANKS) { for i in 0..Self::OCCUPIED_ROWS {
if !cfg!(feature = "cacheless") { if !cfg!(feature = "cacheless") {
self.invalidate_bank(EVEN_BANK_INDEX + i); self.invalidate_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
self.invalidate_bank(ODD_BANK_INDEX + i); self.invalidate_bank(ODD_BANK_INDEX + i * NUMBER_OF_BANKS);
barrier::dsb(barrier::SY); barrier::dsb(barrier::SY);
} }
// Read from first and second bank // Read from first and second bank
self.read_data_bank(EVEN_BANK_INDEX + i); self.read_data_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
self.read_data_bank(ODD_BANK_INDEX + i); self.read_data_bank(ODD_BANK_INDEX + i * NUMBER_OF_BANKS);
barrier::dsb(barrier::SY); barrier::dsb(barrier::SY);
} }
@@ -112,28 +112,23 @@ pub trait PimRegion {
fn read_data_bank(&self, bank_index: usize) { fn read_data_bank(&self, bank_index: usize) {
let bank = self.bank_ptr(bank_index); let bank = self.bank_ptr(bank_index);
// For some reason, this is needed...
use core::fmt::Write;
write!(&mut crate::uart::Uart0 {}, "").unwrap();
unsafe { unsafe {
core::ptr::read_volatile(bank); core::ptr::read_volatile(bank);
} }
} }
fn execute_instruction_write_single_bank(&mut self) { fn execute_instruction_write_single_bank(&mut self) {
for i in (0..Self::OCCUPIED_ROWS).map(|i| i * NUMBER_OF_BANKS) { for i in 0..Self::OCCUPIED_ROWS {
if !cfg!(feature = "cacheless") { if !cfg!(feature = "cacheless") {
self.preload_zero_bank(EVEN_BANK_INDEX + i); self.preload_zero_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
barrier::dsb(barrier::SY); barrier::dsb(barrier::SY);
} }
// Write to first bank // Write to first bank
self.write_data_bank(EVEN_BANK_INDEX + i); self.write_data_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
if !cfg!(feature = "cacheless") { if !cfg!(feature = "cacheless") {
self.invalidate_flush_bank(EVEN_BANK_INDEX + i); self.invalidate_flush_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
} }
barrier::dsb(barrier::SY); barrier::dsb(barrier::SY);
@@ -141,20 +136,20 @@ pub trait PimRegion {
} }
fn execute_instruction_write_dual_bank(&mut self) { fn execute_instruction_write_dual_bank(&mut self) {
for i in (0..Self::OCCUPIED_ROWS).map(|i| i * NUMBER_OF_BANKS) { for i in 0..Self::OCCUPIED_ROWS {
if !cfg!(feature = "cacheless") { if !cfg!(feature = "cacheless") {
self.preload_zero_bank(EVEN_BANK_INDEX + i); self.preload_zero_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
self.preload_zero_bank(ODD_BANK_INDEX + i); self.preload_zero_bank(ODD_BANK_INDEX + i * NUMBER_OF_BANKS);
barrier::dsb(barrier::SY); barrier::dsb(barrier::SY);
} }
// Write to first and second bank // Write to first and second bank
self.write_data_bank(EVEN_BANK_INDEX + i); self.write_data_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
self.write_data_bank(ODD_BANK_INDEX + i); self.write_data_bank(ODD_BANK_INDEX + i * NUMBER_OF_BANKS);
if !cfg!(feature = "cacheless") { if !cfg!(feature = "cacheless") {
self.invalidate_flush_bank(EVEN_BANK_INDEX + i); self.invalidate_flush_bank(EVEN_BANK_INDEX + i * NUMBER_OF_BANKS);
self.invalidate_flush_bank(ODD_BANK_INDEX + i); self.invalidate_flush_bank(ODD_BANK_INDEX + i * NUMBER_OF_BANKS);
} }
barrier::dsb(barrier::SY); barrier::dsb(barrier::SY);
@@ -163,11 +158,6 @@ pub trait PimRegion {
fn write_data_bank(&mut self, bank_index: usize) { fn write_data_bank(&mut self, bank_index: usize) {
let bank = self.bank_ptr_mut(bank_index); let bank = self.bank_ptr_mut(bank_index);
// For some reason, this is needed...
use core::fmt::Write;
write!(&mut crate::uart::Uart0 {}, "").unwrap();
unsafe { unsafe {
core::ptr::write_volatile(bank, Default::default()); core::ptr::write_volatile(bank, Default::default());
} }

57
pim-os/src/pim/kernel.rs
View File

@@ -100,3 +100,60 @@ pub const TEST_KERNEL: Kernel = Kernel([
Instruction::NOP, Instruction::NOP,
Instruction::NOP, Instruction::NOP,
]); ]);
// pub const TEST_KERNEL: Kernel = Kernel([
// Instruction::MOV {
// src: File::Bank,
// dst: File::GrfA { index: 0 },
// },
// Instruction::MOV {
// src: File::Bank,
// dst: File::GrfA { index: 1 },
// },
// Instruction::ADD {
// src0: File::Bank,
// src1: File::GrfA { index: 0 },
// dst: File::GrfA { index: 0 },
// aam: false,
// },
// Instruction::ADD {
// src0: File::Bank,
// src1: File::GrfA { index: 1 },
// dst: File::GrfA { index: 1 },
// aam: false,
// },
// Instruction::FILL {
// src: File::GrfA { index: 0 },
// dst: File::Bank,
// },
// Instruction::FILL {
// src: File::GrfA { index: 1 },
// dst: File::Bank,
// },
// Instruction::EXIT,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// Instruction::NOP,
// ]);