Skip to content

Commit

Permalink
kernel memcpy, updated example
Browse files Browse the repository at this point in the history
  • Loading branch information
@sajattack
sajattack committed Aug 18, 2020
1 parent 5a54abe commit e3cb49b
Show file tree
Hide file tree
Showing 3 changed files with 109 additions and 62 deletions.
123 changes: 79 additions & 44 deletions examples/memcpy_bench/src/main.rs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#![no_std]
#![no_main]

psp::module!("sample_module", 1, 1);
extern crate alloc;
use alloc::alloc::Layout;
use alloc::format;
use core::time::Duration;
use core::ffi::c_void;
use psp::sys::SceUid;

psp::module!("sample_module", 1, 1);

fn psp_main() {
psp::enable_home_button();
Expand All @@ -15,49 +19,80 @@ fn psp_main() {
sys::sceKernelChangeCurrentThreadAttr(0, ThreadAttributes::VFPU);
}

let size = 16;
let iterations = 1000;
let cpu_dur: Duration;
let cpu32_dur: Duration;
let dmac_dur: Duration;
let vfpu_dur: Duration;

let src = unsafe { alloc::alloc::alloc(Layout::from_size_align_unchecked(size, 16)) };
let dst = unsafe { alloc::alloc::alloc(Layout::from_size_align_unchecked(size, 16)) };
cpu_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { memcpy(dst, src as *const u8, size); }
}
}, 10);

cpu32_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { memcpy32(dst, src as *const u8, size); }
}
}, 10);


dmac_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { psp::sys::sceDmacMemcpy(dst, src as *const u8, size); }
}
}, 10);

vfpu_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { psp::sys::sceVfpuMemcpy(dst, src as *const u8, size); }
}
}, 10);

unsafe { alloc::alloc::dealloc(src, Layout::from_size_align_unchecked(size, 16)); }
unsafe { alloc::alloc::dealloc(dst, Layout::from_size_align_unchecked(size, 16)); }

psp::dprintln!("size: {} bytes", size);
psp::dprintln!("iterations: {}", iterations);
psp::dprintln!("cpu: {} microseconds", cpu_dur.as_micros());
psp::dprintln!("cpu32: {} microseconds", cpu32_dur.as_micros());
psp::dprintln!("dmac: {} microseconds", dmac_dur.as_micros());
psp::dprintln!("vfpu: {} microseconds", vfpu_dur.as_micros());
let iters: [usize; 11] = [16, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1];
let sizes: [usize; 11] = [32,64,512,1024,2048,16348,32768,65536,131072,524288,1048576];

let mut cpu_dur: Duration;
let mut cpu32_dur: Duration;
let mut kernel_dur: Duration;
let mut dmac_dur: Duration;
let mut vfpu_dur: Duration;

let fd = unsafe { psp::sys::sceIoOpen(b"host0:/results.txt\0".as_ptr(), psp::sys::IoOpenFlags::CREAT | psp::sys::IoOpenFlags::RD_WR, 0o777) };

for i in 0..11 {
let size = sizes[i];
let iterations = iters[i];
let src = unsafe { alloc::alloc::alloc(Layout::from_size_align_unchecked(size, 16)) };
let dst = unsafe { alloc::alloc::alloc(Layout::from_size_align_unchecked(size, 16)) };
cpu_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { memcpy(dst, src as *const u8, size); }
}
}, 10);

cpu32_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { memcpy32(dst, src as *const u8, size); }
}
}, 10);

kernel_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { psp::sys::sceKernelMemcpy(dst, src as *const u8, size); }
}
}, 10);

dmac_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { psp::sys::sceDmacMemcpy(dst, src as *const u8, size); }
}
}, 10);

vfpu_dur = psp::benchmark(|| {
for _ in 0..iterations {
unsafe { psp::sys::sceVfpuMemcpy(dst, src as *const u8, size); }
}
}, 10);

unsafe { alloc::alloc::dealloc(src, Layout::from_size_align_unchecked(size, 16)); }
unsafe { alloc::alloc::dealloc(dst, Layout::from_size_align_unchecked(size, 16)); }

let output = format!(
"size: {} bytes
iterations: {}
cpu: {} microseconds
cpu32: {} microseconds
kernel: {} microseconds
dmac: {} microseconds
vfpu: {} microseconds\n\n",
size, iterations, cpu_dur.as_micros(), cpu32_dur.as_micros(),
kernel_dur.as_micros(), dmac_dur.as_micros(),
vfpu_dur.as_micros()
);
write_to_fd(fd, output);
}
unsafe { psp::sys::sceIoClose(fd) };
}

fn write_to_fd(fd: SceUid, msg: alloc::string::String) {
unsafe {
psp::sys::sceIoWrite(
fd,
msg.as_str().as_bytes().as_ptr() as *const u8 as *const c_void,
msg.len()
)
};
}

unsafe fn memcpy(dst: *mut u8, src: *const u8, num: usize) -> *mut u8 {
Expand Down
45 changes: 27 additions & 18 deletions psp/src/alloc_impl.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,30 +77,39 @@ unsafe extern fn memset(ptr: *mut u8, value: u32, num: usize) -> *mut u8 {
ptr
}


#[no_mangle]
#[cfg(not(feature = "stub-only"))]
unsafe extern fn memcpy(dst: *mut u8, src: *const u8, num: isize) -> *mut u8 {
let mut size = num as usize;
let mut dst32 = dst as *mut u32;
let mut src32 = src as *const u32;
while size > 3 {
*dst32 = *src32;
dst32 = dst32.add(1);
src32 = src32.add(1);
size = size.saturating_sub(4);
}
let mut dst_new = dst32 as *mut u8;
let mut src_new = src32 as *const u8;
while size > 0 {
*dst_new = *src_new;
dst_new = dst_new.add(1);
src_new = src_new.add(1);
size = size.saturating_sub(1);
unsafe extern fn memcpy(dst: *mut u8, src: *const u8, num: usize) -> *mut u8 {
for i in 0..num {
*dst.add(i) = *src.add(i);
}
dst
}

// broke format macro somehow
//#[no_mangle]
//#[cfg(not(feature = "stub-only"))]
//unsafe extern fn memcpy(dst: *mut u8, src: *const u8, num: isize) -> *mut u8 {
//let mut size = num as usize;
//let mut dst32 = dst as *mut u32;
//let mut src32 = src as *const u32;
//while size > 3 {
//*dst32 = *src32;
//dst32 = dst32.add(1);
//src32 = src32.add(1);
//size = size.saturating_sub(4);
//}
//let mut dst_new = dst32 as *mut u8;
//let mut src_new = src32 as *const u8;
//while size > 0 {
//*dst_new = *src_new;
//dst_new = dst_new.add(1);
//src_new = src_new.add(1);
//size = size.saturating_sub(1);
//}
//dst
//}

#[no_mangle]
#[cfg(not(feature = "stub-only"))]
unsafe extern fn memcmp(ptr1: *mut u8, ptr2: *mut u8, num: isize) -> i32 {
Expand Down
3 changes: 3 additions & 0 deletions psp/src/sys/kernel/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,9 @@ psp_extern! {
///
/// 1 if interrupts are currently enabled.
pub fn sceKernelIsCpuIntrEnable() -> i32;

#[psp(0x1839852A)]
pub fn sceKernelMemcpy(dst: *mut u8, src: *const u8, num: usize) -> *mut u8;
}

#[repr(C)]
Expand Down

0 comments on commit e3cb49b

Please sign in to comment.