Skip to content

Make non-natural alignment a validation error in spec interpreter / test #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevenfontanella wants to merge 2 commits into
base: main
Choose a base branch
from
+430 −20
Open

Make non-natural alignment a validation error in spec interpreter / test #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dce77b
Add tests for alignment hint less than natural alignment
stevenfontanella Jan 29, 2026
36eb53a
Make non-natural alignment on atomic memroy operations a validation e…
stevenfontanella Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions interpreter/valid/valid.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ let check_vec_binop binop at =
error at "invalid lane index"
| _ -> ()

let check_memop (c : context) (memop : ('t, 's) memop) ty_size get_sz at =
let check_memop (c : context) (memop : ('t, 's) memop) ty_size get_sz at ~(isAtomic : bool) =
Copy link
Member

@rossberg rossberg Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Labelled arguments are a somewhat controversial language feature, let's avoid them if we can. I suggest:

Suggested change
let check_memop (c : context) (memop : ('t, 's) memop) ty_size get_sz at ~(isAtomic : bool) =
type mem_mode = NonAtomic | Atomic
let check_memop mode (c : context) (memop : ('t, 's) memop) ty_size get_sz at =

let _mt = memory c (0l @@ at) in
let size =
match get_sz memop.pack with
Expand All @@ -199,7 +199,9 @@ let check_memop (c : context) (memop : ('t, 's) memop) ty_size get_sz at =
packed_size sz
in
require (1 lsl memop.align <= size) at
"alignment must not be larger than natural"
"alignment must not be larger than natural";
if isAtomic then
require (1 lsl memop.align == size) at "atomic memory instruction's alignment must equal the instruction's natural alignment"

Comment on lines 201 to 205
Copy link
Member

@rossberg rossberg Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one of the two conditions needs to apply.

Suggested change
require (1 lsl memop.align <= size) at
"alignment must not be larger than natural"
"alignment must not be larger than natural";
if isAtomic then
require (1 lsl memop.align == size) at "atomic memory instruction's alignment must equal the instruction's natural alignment"
match mode with
| NonAtomic ->
require (1 lsl memop.align <= size) at
"alignment must not be larger than natural"
| Atomic ->
require (1 lsl memop.align == size) at
"alignment for atomic must equal natural"


(*
Expand Down Expand Up @@ -354,29 +356,29 @@ let rec check_instr (c : context) (e : instr) (s : infer_result_type) : op_type
[] --> []

| Load memop ->
check_memop c memop num_size (Lib.Option.map fst) e.at;
check_memop ~isAtomic:false c memop num_size (Lib.Option.map fst) e.at;
Copy link
Member

@rossberg rossberg Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
check_memop ~isAtomic:false c memop num_size (Lib.Option.map fst) e.at;
check_memop NonAtomic c memop num_size (Lib.Option.map fst) e.at;

...and so on.

[NumType I32Type] --> [NumType memop.ty]

| Store memop ->
check_memop c memop num_size (fun sz -> sz) e.at;
check_memop ~isAtomic:false c memop num_size (fun sz -> sz) e.at;
[NumType I32Type; NumType memop.ty] --> []

| VecLoad memop ->
check_memop c memop vec_size (Lib.Option.map fst) e.at;
check_memop ~isAtomic:false c memop vec_size (Lib.Option.map fst) e.at;
[NumType I32Type] --> [VecType memop.ty]

| VecStore memop ->
check_memop c memop vec_size (fun _ -> None) e.at;
check_memop ~isAtomic:false c memop vec_size (fun _ -> None) e.at;
[NumType I32Type; VecType memop.ty] --> []

| VecLoadLane (memop, i) ->
check_memop c memop vec_size (fun sz -> Some sz) e.at;
check_memop ~isAtomic:false c memop vec_size (fun sz -> Some sz) e.at;
require (i < vec_size memop.ty / packed_size memop.pack) e.at
"invalid lane index";
[NumType I32Type; VecType memop.ty] --> [VecType memop.ty]

| VecStoreLane (memop, i) ->
check_memop c memop vec_size (fun sz -> Some sz) e.at;
check_memop ~isAtomic:false c memop vec_size (fun sz -> Some sz) e.at;
require (i < vec_size memop.ty / packed_size memop.pack) e.at
"invalid lane index";
[NumType I32Type; VecType memop.ty] --> []
Expand Down Expand Up @@ -514,23 +516,23 @@ let rec check_instr (c : context) (e : instr) (s : infer_result_type) : op_type
"invalid lane index";
[t; NumType t2] --> [t]
| MemoryAtomicWait atomicop ->
check_memop c atomicop num_size (fun sz -> sz) e.at;
check_memop ~isAtomic:true c atomicop num_size (fun sz -> sz) e.at;
[NumType I32Type; NumType atomicop.ty; NumType I64Type] --> [NumType I32Type]
| MemoryAtomicNotify atomicop ->
check_memop c atomicop num_size (fun sz -> sz) e.at;
check_memop ~isAtomic:true c atomicop num_size (fun sz -> sz) e.at;
[NumType I32Type; NumType I32Type] --> [NumType I32Type]
| AtomicFence -> [] --> []
| AtomicLoad atomicop ->
check_memop c atomicop num_size (fun sz -> sz) e.at;
check_memop ~isAtomic:true c atomicop num_size (fun sz -> sz) e.at;
[NumType I32Type] --> [NumType atomicop.ty]
| AtomicStore atomicop ->
check_memop c atomicop num_size (fun sz -> sz) e.at;
check_memop ~isAtomic:true c atomicop num_size (fun sz -> sz) e.at;
[NumType I32Type; NumType atomicop.ty] --> []
| AtomicRmw (rmwop, atomicop) ->
check_memop c atomicop num_size (fun sz -> sz) e.at;
check_memop ~isAtomic:true c atomicop num_size (fun sz -> sz) e.at;
[NumType I32Type; NumType atomicop.ty] --> [NumType atomicop.ty]
| AtomicRmwCmpXchg atomicop ->
check_memop c atomicop num_size (fun sz -> sz) e.at;
check_memop ~isAtomic: true c atomicop num_size (fun sz -> sz) e.at;
[NumType I32Type; NumType atomicop.ty; NumType atomicop.ty] --> [NumType atomicop.ty]

and check_seq (c : context) (s : infer_result_type) (es : instr list)
Expand Down
Loading
Loading