Skip to content

Commit

Permalink
Reverts rng changes
Browse files Browse the repository at this point in the history
  • Loading branch information
vilukissa68 committed May 16, 2024
1 parent d839dd5 commit 07c802b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions examples/hpc/dla-driver/examples/mac_benchmark.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ fn calculate_conv2d_out_param_dim(
fn generate_random_array(buffer: &mut [i8], size: usize) {
let mut rng = SmallRng::seed_from_u64(1234567890);
for i in 0..size {
buffer[i] = (((rng.next_u64() % u8::MAX as u64) as i8) + i8::MIN) as i8;
buffer[i] = rng.next_u64() as i8;
}
}

fn generate_random_matrix(height: u32, width: u32, seed: u64) -> Vec<i8> {
let mut res: Vec<i8> = Vec::new();
let mut rng = SmallRng::seed_from_u64(seed);
for _ in 0..(height * width) {
res.push((((rng.next_u64() % u8::MAX as u64) as i8) + i8::MIN) as i8);
res.push((rng.next_u64() & 0xFF) as i8);
}
res
}
Expand All @@ -45,7 +45,7 @@ fn generate_random_matrix_small(height: u32, width: u32, seed: u64) -> Vec<i8> {
let mut res: Vec<i8> = Vec::new();
let mut rng = SmallRng::seed_from_u64(seed);
for _ in 0..(height * width) {
res.push((((rng.next_u64() % 4) as i8) - 2) as i8);
res.push((rng.next_u64() & 0x3) as i8);
}
res
}
Expand Down
12 changes: 6 additions & 6 deletions examples/hpc/dla-driver/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,27 +182,27 @@ impl Dla {
Dla {}
}
pub fn write_u8(&self, offset: usize, value: u8) {
unsafe { ptr::write_volatile((offset) as *mut u8, value) };
unsafe { ptr::write_volatile((offset) as *mut _, value) };
}

fn write_u32(&self, offset: usize, value: u32) {
unsafe { ptr::write_volatile((DLA0_ADDR + offset) as *mut u32, value) }
unsafe { ptr::write_volatile((DLA0_ADDR + offset) as *mut _, value) }
}

fn read_u32(&self, offset: usize) -> u32 {
unsafe { ptr::read_volatile((DLA0_ADDR + offset) as *mut u32) }
unsafe { ptr::read_volatile((DLA0_ADDR + offset) as *mut _) }
}

pub fn read_bytes(&self, offset: usize, len: usize, buf: &mut [u8]) {
for i in 0..len {
unsafe { buf[i] = ptr::read_volatile((DLA0_ADDR + offset + i) as *mut u8) }
unsafe { buf[i] = ptr::read_volatile((DLA0_ADDR + offset + i) as *mut _) }
}
}

pub fn write_data_bank(&self, offset: usize, buf: &mut [i8]) {
//sprintln!("\nWrite to bank {:#x}, data: {:?}", offset, buf);
for (i, b) in buf.iter().enumerate() {
unsafe { ptr::write_volatile((MEMORY_BANK_BASE_ADDR + offset + i) as *mut i8, *b) };
unsafe { ptr::write_volatile((MEMORY_BANK_BASE_ADDR + offset + i) as *mut _, *b) };
}
}

Expand All @@ -221,7 +221,7 @@ impl Dla {
result
} else {
unsafe {
ptr::read_volatile((MEMORY_BANK_BASE_ADDR + bank.addr() + offset) as *mut u128)
ptr::read_volatile((MEMORY_BANK_BASE_ADDR + bank.addr() + offset) as *mut _)
}
}
}
Expand Down

0 comments on commit 07c802b

Please sign in to comment.