Skip to content

Commit a4e7001

Browse files
chore: add more memory superinstructions
Signed-off-by: Henry <mail@henrygressmann.de>
1 parent 1dc86cd commit a4e7001

4 files changed

Lines changed: 194 additions & 14 deletions

File tree

‎crates/parser/src/optimize.rs‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,16 @@ fn rewrite(
164164
rewrite!(instrs, i, [LocalGet128(local), Const128(c)] => BinOpLocalConst128(BinOp128::AndNot, local, c));
165165
}
166166
I32Store(memarg) | F32Store(memarg) => {
167+
rewrite!(instrs, i,
168+
[LocalGet32(addr), LoadLocal32(load_memarg, load_addr), AddConst32(1)] if
169+
(load_memarg == memarg && addr == u16::from(load_addr)) =>
170+
IncMemoryLocal32(memarg, load_addr)
171+
);
172+
rewrite!(instrs, i,
173+
[LocalGet64(addr), LoadLocal32(load_memarg, load_addr), AddConst32(1)] if
174+
(load_memarg == memarg && addr == u16::from(load_addr)) =>
175+
IncMemoryLocal32(memarg, load_addr)
176+
);
167177
rewrite!(instrs, i, [F32Mul, F32Add] => FMaStoreF32(memarg));
168178
rewrite!(instrs, i,
169179
[LocalGet32(addr_local), LocalGet32(value_local)] if
@@ -172,6 +182,16 @@ fn rewrite(
172182
);
173183
}
174184
I64Store(memarg) | F64Store(memarg) => {
185+
rewrite!(instrs, i,
186+
[LocalGet32(addr), LoadLocal64(load_memarg, load_addr), AddConst64(1)] if
187+
(load_memarg == memarg && addr == u16::from(load_addr)) =>
188+
IncMemoryLocal64(memarg, load_addr)
189+
);
190+
rewrite!(instrs, i,
191+
[LocalGet64(addr), LoadLocal64(load_memarg, load_addr), AddConst64(1)] if
192+
(load_memarg == memarg && addr == u16::from(load_addr)) =>
193+
IncMemoryLocal64(memarg, load_addr)
194+
);
175195
rewrite!(instrs, i, [F64Mul, F64Add] => FMaStoreF64(memarg));
176196
rewrite!(instrs, i,
177197
[LocalGet32(addr_local), LocalGet64(value_local)] if
@@ -191,6 +211,60 @@ fn rewrite(
191211
[LocalGet32(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
192212
LoadLocal32(memarg, addr_local)
193213
);
214+
rewrite!(instrs, i,
215+
[LocalGet64(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
216+
LoadLocal32(memarg, addr_local)
217+
);
218+
}
219+
I64Load(memarg) | F64Load(memarg) => {
220+
rewrite!(instrs, i,
221+
[LocalGet32(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
222+
LoadLocal64(memarg, addr_local)
223+
);
224+
rewrite!(instrs, i,
225+
[LocalGet64(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
226+
LoadLocal64(memarg, addr_local)
227+
);
228+
}
229+
I32Load8S(memarg) => {
230+
rewrite!(instrs, i,
231+
[LocalGet32(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
232+
LoadLocal8S32(memarg, addr_local)
233+
);
234+
rewrite!(instrs, i,
235+
[LocalGet64(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
236+
LoadLocal8S32(memarg, addr_local)
237+
);
238+
}
239+
I32Load8U(memarg) => {
240+
rewrite!(instrs, i,
241+
[LocalGet32(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
242+
LoadLocal8U32(memarg, addr_local)
243+
);
244+
rewrite!(instrs, i,
245+
[LocalGet64(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
246+
LoadLocal8U32(memarg, addr_local)
247+
);
248+
}
249+
I32Load16S(memarg) => {
250+
rewrite!(instrs, i,
251+
[LocalGet32(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
252+
LoadLocal16S32(memarg, addr_local)
253+
);
254+
rewrite!(instrs, i,
255+
[LocalGet64(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
256+
LoadLocal16S32(memarg, addr_local)
257+
);
258+
}
259+
I32Load16U(memarg) => {
260+
rewrite!(instrs, i,
261+
[LocalGet32(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
262+
LoadLocal16U32(memarg, addr_local)
263+
);
264+
rewrite!(instrs, i,
265+
[LocalGet64(addr_local)] if (let Ok(addr_local) = u8::try_from(addr_local)) =>
266+
LoadLocal16U32(memarg, addr_local)
267+
);
194268
}
195269
MemoryFill(mem) => {
196270
rewrite!(instrs, i, [Const32(val), Const32(size)] => MemoryFillImm(mem, val as u8, size))
@@ -231,6 +305,10 @@ fn rewrite(
231305
set_local_const = SetLocalConst32
232306
);
233307
rewrite!(instrs, i, [LoadLocal32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) => LoadLocalSet32(memarg, addr, dst));
308+
rewrite!(instrs, i, [LoadLocal8S32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) => LoadLocalSet8S32(memarg, addr, dst));
309+
rewrite!(instrs, i, [LoadLocal8U32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) => LoadLocalSet8U32(memarg, addr, dst));
310+
rewrite!(instrs, i, [LoadLocal16S32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) => LoadLocalSet16S32(memarg, addr, dst));
311+
rewrite!(instrs, i, [LoadLocal16U32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) => LoadLocalSet16U32(memarg, addr, dst));
234312
rewrite!(instrs, i,
235313
[LocalGet32(addr), I32Load(memarg)] if
236314
(let (Ok(addr), Ok(dst)) = (u8::try_from(addr), u8::try_from(dst))) =>
@@ -333,6 +411,22 @@ fn rewrite(
333411
[LoadLocal32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) =>
334412
LoadLocalTee32(memarg, addr, dst)
335413
);
414+
rewrite!(instrs, i,
415+
[LoadLocal8S32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) =>
416+
LoadLocalTee8S32(memarg, addr, dst)
417+
);
418+
rewrite!(instrs, i,
419+
[LoadLocal8U32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) =>
420+
LoadLocalTee8U32(memarg, addr, dst)
421+
);
422+
rewrite!(instrs, i,
423+
[LoadLocal16S32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) =>
424+
LoadLocalTee16S32(memarg, addr, dst)
425+
);
426+
rewrite!(instrs, i,
427+
[LoadLocal16U32(memarg, addr)] if (let Ok(dst) = u8::try_from(dst)) =>
428+
LoadLocalTee16U32(memarg, addr, dst)
429+
);
336430
}
337431
LocalTee64(dst) => {
338432
fold_local_binop!(

‎crates/tinywasm/src/interpreter/executor.rs‎

Lines changed: 68 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,41 @@ impl<'store, const BUDGETED: bool> Executor<'store, BUDGETED> {
334334
SetLocalConst32(local_index, c) => i32::local_set(&mut self.store.value_stack, &self.cf, *local_index, *c),
335335
SetLocalConst64(local_index, c) => i64::local_set(&mut self.store.value_stack, &self.cf, *local_index, *c),
336336
SetLocalConst128(local_index, c) => Value128::local_set(&mut self.store.value_stack, &self.cf, *local_index, Value128(self.func.data.v128_const(*c))),
337+
IncMemoryLocal32(m, addr_local) => self.exec_inc_memory_local::<i32, 4>(*m, *addr_local, |v| v.wrapping_add(1))?,
338+
IncMemoryLocal64(m, addr_local) => self.exec_inc_memory_local::<i64, 8>(*m, *addr_local, |v| v.wrapping_add(1))?,
337339
StoreLocalLocal32(m, addr_local, value_local) => self.exec_store_local_local::<u32, 4>(*m, *addr_local, *value_local)?,
338340
StoreLocalLocal64(m, addr_local, value_local) => self.exec_store_local_local::<i64, 8>(*m, *addr_local, *value_local)?,
339341
StoreLocalLocal128(m, addr_local, value_local) => self.exec_store_local_local::<Value128, 16>(*m, *addr_local, *value_local)?,
340342
LoadLocal32(m, addr_local) => self.store.value_stack.push(self.exec_load_local_value::<i32, 4>(*m, *addr_local)?)?,
341-
LoadLocalTee32(m, addr_local, dst_local) => self.exec_load_local_tee::<i32, 4>(*m, *addr_local, *dst_local)?,
342-
LoadLocalSet32(m, addr_local, dst_local) => self.exec_load_local_set::<i32, 4>(*m, *addr_local, *dst_local)?,
343-
LoadLocalTee128(m, addr_local, dst_local) => self.exec_load_local_tee::<Value128, 16>(*m, *addr_local, *dst_local)?,
344-
LoadLocalSet128(m, addr_local, dst_local) => self.exec_load_local_set::<Value128, 16>(*m, *addr_local, *dst_local)?,
343+
LoadLocal64(m, addr_local) => self.store.value_stack.push(self.exec_load_local_value::<i64, 8>(*m, *addr_local)?)?,
344+
LoadLocal8S32(m, addr_local) => {
345+
let value = self.exec_load_local_value::<i8, 1>(*m, *addr_local)?;
346+
self.store.value_stack.push(i32::from(value))?;
347+
}
348+
LoadLocal8U32(m, addr_local) => {
349+
let value = self.exec_load_local_value::<u8, 1>(*m, *addr_local)?;
350+
self.store.value_stack.push(i32::from(value))?;
351+
}
352+
LoadLocal16S32(m, addr_local) => {
353+
let value = self.exec_load_local_value::<i16, 2>(*m, *addr_local)?;
354+
self.store.value_stack.push(i32::from(value))?;
355+
}
356+
LoadLocal16U32(m, addr_local) => {
357+
let value = self.exec_load_local_value::<u16, 2>(*m, *addr_local)?;
358+
self.store.value_stack.push(i32::from(value))?;
359+
}
360+
LoadLocalTee32(m, addr_local, dst_local) => self.exec_load_local_tee::<i32, 4, _>(*m, *addr_local, *dst_local, |v| v)?,
361+
LoadLocalSet32(m, addr_local, dst_local) => self.exec_load_local_set::<i32, 4, _>(*m, *addr_local, *dst_local, |v| v)?,
362+
LoadLocalTee8S32(m, addr_local, dst_local) => self.exec_load_local_tee::<i8, 1, _>(*m, *addr_local, *dst_local, i32::from)?,
363+
LoadLocalTee8U32(m, addr_local, dst_local) => self.exec_load_local_tee::<u8, 1, _>(*m, *addr_local, *dst_local, i32::from)?,
364+
LoadLocalTee16S32(m, addr_local, dst_local) => self.exec_load_local_tee::<i16, 2, _>(*m, *addr_local, *dst_local, i32::from)?,
365+
LoadLocalTee16U32(m, addr_local, dst_local) => self.exec_load_local_tee::<u16, 2, _>(*m, *addr_local, *dst_local, i32::from)?,
366+
LoadLocalSet8S32(m, addr_local, dst_local) => self.exec_load_local_set::<i8, 1, _>(*m, *addr_local, *dst_local, i32::from)?,
367+
LoadLocalSet8U32(m, addr_local, dst_local) => self.exec_load_local_set::<u8, 1, _>(*m, *addr_local, *dst_local, i32::from)?,
368+
LoadLocalSet16S32(m, addr_local, dst_local) => self.exec_load_local_set::<i16, 2, _>(*m, *addr_local, *dst_local, i32::from)?,
369+
LoadLocalSet16U32(m, addr_local, dst_local) => self.exec_load_local_set::<u16, 2, _>(*m, *addr_local, *dst_local, i32::from)?,
370+
LoadLocalTee128(m, addr_local, dst_local) => self.exec_load_local_tee::<Value128, 16, _>(*m, *addr_local, *dst_local, |v| v)?,
371+
LoadLocalSet128(m, addr_local, dst_local) => self.exec_load_local_set::<Value128, 16, _>(*m, *addr_local, *dst_local, |v| v)?,
345372
AndConstTee32(c, local_index) => { stack_op!(unary i32, |v| v & *c); stack_op!(local_tee i32, local_index); }
346373
SubConstTee32(c, local_index) => { stack_op!(unary i32, |v| v.wrapping_sub(*c)); stack_op!(local_tee i32, local_index); }
347374
AndConstTee64(c, local_index) => { stack_op!(unary i64, |v| v & *c); stack_op!(local_tee i64, local_index); }
@@ -1150,6 +1177,28 @@ impl<'store, const BUDGETED: bool> Executor<'store, BUDGETED> {
11501177
Ok(())
11511178
}
11521179

1180+
#[inline(always)]
1181+
fn exec_inc_memory_local<T: MemValue<N>, const N: usize>(
1182+
&mut self,
1183+
memarg: MemoryArg,
1184+
addr_local: u8,
1185+
increment: impl FnOnce(T) -> T,
1186+
) -> Result<(), Trap> {
1187+
let mem_addr = self.module.resolve_mem_addr(memarg.mem_addr());
1188+
let mem = self.store.state.get_mem(mem_addr);
1189+
let addr = if mem.is_64bit() {
1190+
let base = i64::local_get(&self.store.value_stack, &self.cf, u16::from(addr_local)) as u64;
1191+
mem.effective_addr_64::<N>(base, memarg.offset())?
1192+
} else {
1193+
let base = u32::local_get(&self.store.value_stack, &self.cf, u16::from(addr_local));
1194+
mem.effective_addr_32::<N>(base, memarg.offset())?
1195+
};
1196+
1197+
let mem = self.store.state.get_mem_mut(mem_addr);
1198+
let value = T::load_at(&*mem.inner, addr)?;
1199+
increment(value).store_at(&mut *mem.inner, addr)
1200+
}
1201+
11531202
#[inline(always)]
11541203
fn exec_fma_store<
11551204
T: InternalValue + MemValue<N> + core::ops::Add<Output = T> + core::ops::Mul<Output = T>,
@@ -1187,8 +1236,13 @@ impl<'store, const BUDGETED: bool> Executor<'store, BUDGETED> {
11871236
addr_local: u8,
11881237
) -> Result<T, Trap> {
11891238
let mem = self.store.state.get_mem(self.module.resolve_mem_addr(memarg.mem_addr()));
1190-
let base = u32::local_get(&self.store.value_stack, &self.cf, u16::from(addr_local));
1191-
let addr = mem.effective_addr_32::<N>(base, memarg.offset())?;
1239+
let addr = if mem.is_64bit() {
1240+
let base = i64::local_get(&self.store.value_stack, &self.cf, u16::from(addr_local)) as u64;
1241+
mem.effective_addr_64::<N>(base, memarg.offset())?
1242+
} else {
1243+
let base = u32::local_get(&self.store.value_stack, &self.cf, u16::from(addr_local));
1244+
mem.effective_addr_32::<N>(base, memarg.offset())?
1245+
};
11921246
match T::load_at(&*mem.inner, addr) {
11931247
Ok(res) => Ok(res),
11941248
Err(err) => {
@@ -1198,26 +1252,28 @@ impl<'store, const BUDGETED: bool> Executor<'store, BUDGETED> {
11981252
}
11991253
}
12001254

1201-
fn exec_load_local_tee<T: InternalValue + MemValue<N>, const N: usize>(
1255+
fn exec_load_local_tee<LOAD: MemValue<N>, const N: usize, TARGET: InternalValue>(
12021256
&mut self,
12031257
memarg: MemoryArg,
12041258
addr_local: u8,
12051259
dst_local: u8,
1260+
cast: impl Fn(LOAD) -> TARGET,
12061261
) -> Result<(), Trap> {
1207-
let value = self.exec_load_local_value::<T, N>(memarg, addr_local)?;
1208-
T::local_set(&mut self.store.value_stack, &self.cf, u16::from(dst_local), value);
1262+
let value = cast(self.exec_load_local_value::<LOAD, N>(memarg, addr_local)?);
1263+
TARGET::local_set(&mut self.store.value_stack, &self.cf, u16::from(dst_local), value);
12091264
self.store.value_stack.push(value)?;
12101265
Ok(())
12111266
}
12121267

1213-
fn exec_load_local_set<T: InternalValue + MemValue<N>, const N: usize>(
1268+
fn exec_load_local_set<LOAD: MemValue<N>, const N: usize, TARGET: InternalValue>(
12141269
&mut self,
12151270
memarg: MemoryArg,
12161271
addr_local: u8,
12171272
dst_local: u8,
1273+
cast: impl Fn(LOAD) -> TARGET,
12181274
) -> Result<(), Trap> {
1219-
let value = self.exec_load_local_value::<T, N>(memarg, addr_local)?;
1220-
T::local_set(&mut self.store.value_stack, &self.cf, u16::from(dst_local), value);
1275+
let value = cast(self.exec_load_local_value::<LOAD, N>(memarg, addr_local)?);
1276+
TARGET::local_set(&mut self.store.value_stack, &self.cf, u16::from(dst_local), value);
12211277
Ok(())
12221278
}
12231279

‎crates/tinywasm/src/store/memory/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ macro_rules! impl_mem_traits {
375375

376376
#[inline(always)]
377377
fn load_at(mem: &dyn LinearMemory, addr: usize) -> core::result::Result<Self, crate::Trap> {
378-
Ok(Self::from_mem_bytes(match mem.$read(addr) {
378+
Ok(Self::from_le_bytes(match mem.$read(addr) {
379379
Ok(bytes) => bytes,
380380
Err(trap) => {
381381
cold_path();

‎crates/types/src/instructions.rs‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,27 @@ pub enum Instruction {
150150
BinOpStackGlobal32(BinOp, u32),
151151
BinOpStackGlobal64(BinOp, u32),
152152
SetLocalConst32(LocalAddr, i32), SetLocalConst64(LocalAddr, i64), SetLocalConst128(LocalAddr, ConstIdx),
153+
IncMemoryLocal32(MemoryArg, u8),
154+
IncMemoryLocal64(MemoryArg, u8),
153155
StoreLocalLocal32(MemoryArg, u8, u8),
154156
StoreLocalLocal64(MemoryArg, u8, u8),
155157
StoreLocalLocal128(MemoryArg, u8, u8),
156158
LoadLocal32(MemoryArg, u8),
159+
LoadLocal64(MemoryArg, u8),
160+
LoadLocal8S32(MemoryArg, u8),
161+
LoadLocal8U32(MemoryArg, u8),
162+
LoadLocal16S32(MemoryArg, u8),
163+
LoadLocal16U32(MemoryArg, u8),
157164
LoadLocalTee32(MemoryArg, u8, u8),
158165
LoadLocalSet32(MemoryArg, u8, u8),
166+
LoadLocalTee8S32(MemoryArg, u8, u8),
167+
LoadLocalTee8U32(MemoryArg, u8, u8),
168+
LoadLocalTee16S32(MemoryArg, u8, u8),
169+
LoadLocalTee16U32(MemoryArg, u8, u8),
170+
LoadLocalSet8S32(MemoryArg, u8, u8),
171+
LoadLocalSet8U32(MemoryArg, u8, u8),
172+
LoadLocalSet16S32(MemoryArg, u8, u8),
173+
LoadLocalSet16U32(MemoryArg, u8, u8),
159174
LoadLocalTee128(MemoryArg, u8, u8),
160175
LoadLocalSet128(MemoryArg, u8, u8),
161176
AndConstTee32(i32, LocalAddr),
@@ -381,12 +396,27 @@ impl Instruction {
381396
#[inline]
382397
pub const fn memory_addr(&self) -> Option<MemAddr> {
383398
match self {
384-
Self::StoreLocalLocal32(arg, ..)
399+
Self::IncMemoryLocal32(arg, ..)
400+
| Self::IncMemoryLocal64(arg, ..)
401+
| Self::StoreLocalLocal32(arg, ..)
385402
| Self::StoreLocalLocal64(arg, ..)
386403
| Self::StoreLocalLocal128(arg, ..)
387404
| Self::LoadLocal32(arg, ..)
405+
| Self::LoadLocal64(arg, ..)
406+
| Self::LoadLocal8S32(arg, ..)
407+
| Self::LoadLocal8U32(arg, ..)
408+
| Self::LoadLocal16S32(arg, ..)
409+
| Self::LoadLocal16U32(arg, ..)
388410
| Self::LoadLocalTee32(arg, ..)
389411
| Self::LoadLocalSet32(arg, ..)
412+
| Self::LoadLocalTee8S32(arg, ..)
413+
| Self::LoadLocalTee8U32(arg, ..)
414+
| Self::LoadLocalTee16S32(arg, ..)
415+
| Self::LoadLocalTee16U32(arg, ..)
416+
| Self::LoadLocalSet8S32(arg, ..)
417+
| Self::LoadLocalSet8U32(arg, ..)
418+
| Self::LoadLocalSet16S32(arg, ..)
419+
| Self::LoadLocalSet16U32(arg, ..)
390420
| Self::LoadLocalTee128(arg, ..)
391421
| Self::LoadLocalSet128(arg, ..)
392422
| Self::I32Load(arg)

0 commit comments

Comments
 (0)