colin/fdtd-coremem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app: stacked_cores: DriveStrength: Fold {Hold,Release}{Low,High} into just {Fold,Release}

Browse Source
This commit is contained in:
colin
2022-09-04 23:50:29 -07:00
parent 692bfb2571
commit 6ca6e015d2
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
crates/applications/stacked_cores/src/main.rs
View File

@@ -29,26 +29,30 @@ type Sim = SpirvSim::<R, Mat, Backend>;
/// different states each control signal can be in for some clock cycle. /// different states each control signal can be in for some clock cycle.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
enum ClockState { enum ClockState {
HoldHigh(f32), Hold(f32),
ReleaseHigh(f32), Release(f32),
HoldLow(f32),
ReleaseLow(f32),
Float, Float,
} }
type ClockSegment = Shifted<R, Gated<R, Scaled<Exp<R>, R>>>; type ClockSegment = Shifted<R, Gated<R, Scaled<Exp<R>, R>>>;
impl ClockState { impl ClockState {
fn hold(amp: f32) -> Self {
Self::Hold(amp)
}
fn hold_high() -> Self { fn hold_high() -> Self {
Self::HoldHigh(1.0) Self::hold(1.0)
} }
fn hold_low() -> Self { fn hold_low() -> Self {
Self::HoldLow(1.0) Self::hold(-1.0)
}
fn release(amp: f32) -> Self {
Self::Release(amp)
} }
fn release_high() -> Self { fn release_high() -> Self {
Self::ReleaseHigh(1.0) Self::release(1.0)
} }
fn release_low() -> Self { fn release_low() -> Self {
Self::ReleaseLow(1.0) Self::release(-1.0)
} }
fn float() -> Self { fn float() -> Self {
Self::Float Self::Float
@@ -58,10 +62,8 @@ impl ClockState {
{ {
use ClockState::*; use ClockState::*;
match self { match self {
&HoldHigh(amp) => Some(params.control_signal_hold(cycle, amp)), &Hold(amp) => Some(params.control_signal_hold(cycle, amp)),
&ReleaseHigh(amp) => Some(params.control_signal_release(cycle, amp)), &Release(amp) => Some(params.control_signal_release(cycle, amp)),
&HoldLow(amp) => Some(params.control_signal_hold(cycle, -amp)),
&ReleaseLow(amp) => Some(params.control_signal_release(cycle, -amp)),
Float => None, Float => None,
} }
} }
@@ -243,13 +245,13 @@ fn drive_map_isolated_inv() -> [[ClockState; 2]; 6] {
} }
#[allow(unused)] #[allow(unused)]
fn drive_map_3stack() -> [[ClockState; 3]; 6] { fn drive_map_3stack_with_init_amp(amp: f32) -> [[ClockState; 3]; 6] {
use ClockState as C; use ClockState as C;
[ [
// charge S1 to '1', S0/S2 to '0' // charge S1 to '1', S0/S2 to '0'
[C::hold_low(), C::hold_high(), C::hold_low() ], [C::hold_low(), C::hold(amp), C::hold_low() ],
// let the cores settle // let the cores settle
[C::release_low(), C::release_high(),C::release_low()], [C::release_low(), C::release(amp), C::release_low()],
// write S1 -> S0/S2. S0/S2 should be copied to 1 // write S1 -> S0/S2. S0/S2 should be copied to 1
[C::float(), C::hold_low(), C::float() ], [C::float(), C::hold_low(), C::float() ],
@@ -262,6 +264,11 @@ fn drive_map_3stack() -> [[ClockState; 3]; 6] {
] ]
} }
#[allow(unused)]
fn drive_map_3stack() -> [[ClockState; 3]; 6] {
drive_map_3stack_with_init_amp(1.0)
}
#[allow(unused)] #[allow(unused)]
fn drive_map_3stack_and_rev() -> [[ClockState; 3]; 6] { fn drive_map_3stack_and_rev() -> [[ClockState; 3]; 6] {
use ClockState as C; use ClockState as C;