From 27760d547768ee328551db6aa4b97fba04ba24ef Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 1 Mar 2024 03:38:48 +0800 Subject: [PATCH] start on a simple "multi-core" test --- libs/xous-bio/src/bio_tests/mod.rs | 1 + libs/xous-bio/src/bio_tests/units.rs | 128 +++++++++++++++++++-------- 2 files changed, 92 insertions(+), 37 deletions(-) diff --git a/libs/xous-bio/src/bio_tests/mod.rs b/libs/xous-bio/src/bio_tests/mod.rs index 0633e5ba6..9eccb7c2b 100644 --- a/libs/xous-bio/src/bio_tests/mod.rs +++ b/libs/xous-bio/src/bio_tests/mod.rs @@ -79,4 +79,5 @@ pub fn bio_tests() { report_api(crate::get_id()); units::hello_world(); + units::hello_multiverse(); } diff --git a/libs/xous-bio/src/bio_tests/units.rs b/libs/xous-bio/src/bio_tests/units.rs index 91b8593e5..8d8c3157a 100644 --- a/libs/xous-bio/src/bio_tests/units.rs +++ b/libs/xous-bio/src/bio_tests/units.rs @@ -2,57 +2,111 @@ use super::report_api; use crate::*; pub fn hello_world() { - report_api(0x0510_0000); - // map the instruction memory - let imem_slice = unsafe { - core::slice::from_raw_parts_mut( - utralib::generated::HW_BIO_RAM_MEM as *mut u32, - utralib::generated::HW_BIO_RAM_MEM_LEN - ) - }; - - let simple_test_ptr = simple_test as *const u8; - let simple_test_slice = unsafe { - core::slice::from_raw_parts(simple_test_ptr, - (simple_test_end as *const u8) as usize - simple_test_ptr as usize - ) - }; + report_api(0x1310_0000); + let mut bio_ss = BioSharedState::new(); + let simple_test_code = fn_to_slice(simple_test, simple_test_endcap); // copy code to reset vector for 0th machine - for (i, chunk) in simple_test_slice.chunks(4).enumerate() { - if chunk.len() == 4 { - let word: u32 = u32::from_le_bytes(chunk.try_into().unwrap()); - imem_slice[i] = word; - report_api(i as u32); - report_api(word); - } else { - let mut ragged_word = 0; - for (j, &b) in chunk.iter().enumerate() { - ragged_word |= (b as u32) << (4 - chunk.len() + j); - } - imem_slice[i] = ragged_word; - } - } + bio_ss.load_code(simple_test_code, 0); + // configure & run the 0th machine - let mut bio = CSR::new(utra::bio::HW_BIO_BASE as *mut u32); - // /16 clock - bio.wo(utra::bio::SFR_QDIV0, 0x10_0000); + // /32 clock + bio_ss.bio.wo(utra::bio::SFR_QDIV0, 0x20_0000); // start the machine - bio.wo(utra::bio::SFR_CTRL, 0x111); - report_api(0x0510_0001); + bio_ss.bio.wo(utra::bio::SFR_CTRL, 0x111); + report_api(0x1310_00FF); } pub unsafe fn simple_test() { core::arch::asm!( + "add x1, zero, 0x10", "0:", - "nop", + "add x1, x1, 0x1", + "mv x21, x1", + "mv x20, zero", "j 0b", "nop" ); } // this marks the "end address" of simple_test -pub unsafe fn simple_test_end() { +pub unsafe fn simple_test_endcap() { core::arch::asm!( "nop" ); -} \ No newline at end of file +} + +pub fn hello_multiverse() { + report_api(0x1310_1000); + let mut bio_ss = BioSharedState::new(); + // stop all the machines, so that code can be loaded + bio_ss.bio.wo(utra::bio::SFR_CTRL, 0x0); + let mv_test_code = fn_to_slice(multiverse_test, multiverse_test_endcap); + bio_ss.load_code(mv_test_code, 0); + + // configure & run the 0th machine + // /32 clock + bio_ss.bio.wo(utra::bio::SFR_QDIV0, 0x20_0000); + bio_ss.bio.wo(utra::bio::SFR_QDIV1, 0x20_0000); + bio_ss.bio.wo(utra::bio::SFR_QDIV2, 0x20_0000); + bio_ss.bio.wo(utra::bio::SFR_QDIV3, 0x20_0000); + // start all the machines, all at once + bio_ss.bio.wo(utra::bio::SFR_CTRL, 0xfff); + report_api(0x1310_10FF); +} + +pub unsafe fn multiverse_test() { + core::arch::asm!( + // reset vectors for each machine + "j 0f", + "nop", + "j 1f", + "nop", + "j 2f", + "nop", + "j 3f", + "nop", + // mach 0 code + "0:", + "li x26, 0xFF", + "add x1, zero, 0x10", + "4:", + "add x1, x1, 0x1", + "mv x21, x1", + "mv x20, zero", + "j 4b", + // mach 1 code + "1:", + "li x26, 0xFF00", + "add x1, zero, 0x20", + "5:", + "add x1, x1, 0x1", + "slli x21, x1, 8", + "mv x20, zero", + "j 5b", + // mach 2 code + "2:", + "li x26, 0xFF0000", + "add x1, zero, 0x20", + "6:", + "add x1, x1, 0x1", + "slli x21, x1, 16", + "mv x20, zero", + "j 6b", + // mach 3 code + "3:", + "li x26, 0xFF0000", + "add x1, zero, 0x20", + "7:", + "add x1, x1, 0x1", + "slli x21, x1, 24", + "mv x20, zero", + "j 7b", + ); +} +// this marks the "end address" of simple_test +pub unsafe fn multiverse_test_endcap() { + core::arch::asm!( + "nop" + ); + +}