feat: Add llvm codegen for collections.static_array #2003

doug-q · 2025-03-19T14:13:19Z

No description provided.

codecov · 2025-03-19T14:23:34Z

Codecov Report

Attention: Patch coverage is 84.06170% with 62 lines in your changes missing coverage. Please review.

Project coverage is 83.82%. Comparing base (6bd7665) to head (d4a8cf9).

Files with missing lines	Patch %	Lines
...ugr-llvm/src/extension/collections/static_array.rs	85.47%	24 Missing and 29 partials ⚠️
...ore/src/std_extensions/collections/static_array.rs	65.00%	7 Missing ⚠️
hugr-py/src/hugr/std/collections/static_array.py	33.33%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2003      +/-   ##
==========================================
+ Coverage   83.73%   83.82%   +0.08%     
==========================================
  Files         209      210       +1     
  Lines       39266    39645     +379     
  Branches    35937    36315     +378     
==========================================
+ Hits        32879    33232     +353     
+ Misses       4541     4537       -4     
- Partials     1846     1876      +30

Flag	Coverage Δ
python	`92.01% <33.33%> (-0.03%)`	⬇️
rust	`83.07% <84.45%> (+0.10%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

doug-q · 2025-03-19T15:18:18Z

I've deleted some old unusued snapshots (via cargo insta test --unrefeferenced delete)

hugr-llvm/src/extension/collections/static_array.rs

cqc-alec · 2025-03-20T11:24:53Z

hugr-llvm/src/extension/collections/static_array.rs

+        check_emission!(hugr, llvm_ctx);
+    }
+
+    #[rstest]


Do we handle zero-length static arrays? Can we add a test to prove it?

cqc-alec · 2025-03-20T12:00:33Z

hugr-llvm/src/extension/collections/static_array.rs

+    #[case(1, StaticArrayValue::try_new("b", float64_type(), (0..10).map(|x| ConstF64::new(x as f64).into())).unwrap())]
+    #[case(2, StaticArrayValue::try_new("c", bool_t(), (0..10).map(|x| Value::from_bool(x % 2 == 0))).unwrap())]
+    #[case(3, StaticArrayValue::try_new("d", option_type(usize_t()).into(), (0..10).map(|x| Value::some([ConstUsize::new(x)]))).unwrap())]
+    fn static_array_const_codegen(


This and the following test fail when I run

cargo test --all-features --workspace

with the error

thread 'extension::collections::static_array::test::static_array_const_codegen::case_1' panicked at hugr-llvm/src/emit/test.rs:177:48: Parent node Node(1) has extensions [arithmetic.conversions, arithmetic.float, arithmetic.float.types, arithmetic.int, arithmetic.int.types, collections.array, collections.list, logic, prelude] that are too restrictive for child node Node(4), they must include child extensions [collections.static_array, prelude]

I guess we need to annotate them so that they don't run with the extension_inference feature?

Nope, I will fix it so that it works

cqc-alec · 2025-03-20T12:06:12Z

hugr-llvm/src/extension/collections/static_array.rs

+        });
+        assert_eq!(expected, exec_ctx.exec_hugr_u64(hugr, "main"));
+    }
+}


Maybe a test with arrays of arrays would also be good.

Co-authored-by: Alec Edgington <54802828+cqc-alec@users.noreply.github.com>

…g/static-arrays-llvm

…static-arrays-llvm

doug-q · 2025-03-20T14:20:01Z

@alec I think I've addressed all your comments, thank you. Note that we should merge #2009 (which I've merged in here) first

hugrbot · 2025-03-20T14:26:36Z

This PR contains breaking changes to the public Rust API.
Please deprecate the old API instead (if possible), or mark the PR with a ! to indicate a breaking change.

cargo-semver-checks summary


--- failure constructible_struct_adds_private_field: struct no longer constructible due to new private field ---

Description:
A struct constructible with a struct literal has a new non-public field. It can no longer be constructed using a struct literal outside of its crate.
      ref: https://doc.rust-lang.org/reference/expressions/struct-expr.html
     impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.40.0/src/lints/constructible_struct_adds_private_field.ron

Failed in:
field StaticArrayValue.values in /home/runner/work/hugr/hugr/PR_BRANCH/hugr-core/src/std_extensions/collections/static_array.rs:61
field StaticArrayValue.typ in /home/runner/work/hugr/hugr/PR_BRANCH/hugr-core/src/std_extensions/collections/static_array.rs:62

--- failure struct_pub_field_missing: pub struct's pub field removed or renamed ---

Description:
A publicly-visible struct has at least one public field that is no longer available under its prior name. It may have been renamed or removed entirely.
      ref: https://doc.rust-lang.org/cargo/reference/semver.html#item-remove
     impl: https://github.com/obi1kenobi/cargo-semver-checks/tree/v0.40.0/src/lints/struct_pub_field_missing.ron

Failed in:
field value of struct StaticArrayValue, previously in file /home/runner/work/hugr/hugr/BASELINE_BRANCH/hugr-core/src/std_extensions/collections/static_array.rs:61

cqc-alec

LGTM, but this is now breaking -- are we OK with that?

doug-q · 2025-03-20T14:46:47Z

LGTM, but this is now breaking -- are we OK with that?

The PR that I merged in is breaking, and we are OK with that because we have not released the breaking apis.

doug-q added 4 commits March 19, 2025 08:57

wip

cdbce56

Merge branch 'main' of gh:CQCL-DEV/hugr into doug/static-arrays-llvm

bfa48b6

feat: Add llvm codegen for collections.static_array

6a80b97

tidy

5b4f4fc

doug-q added 5 commits March 19, 2025 14:23

doc

2cd97c7

Merge branch 'main' of gh:CQCL-DEV/hugr into doug/static-arrays-llvm

b1859bc

fmt

f83f50f

fix

d673163

cleanup

34be258

doug-q marked this pull request as ready for review March 19, 2025 15:17

doug-q requested a review from a team as a code owner March 19, 2025 15:17

doug-q requested a review from acl-cqc March 19, 2025 15:17

cqc-alec requested review from cqc-alec and removed request for acl-cqc March 20, 2025 08:43

cqc-alec reviewed Mar 20, 2025

View reviewed changes

doug-q and others added 9 commits March 20, 2025 12:10

Update hugr-llvm/src/extension/collections/static_array.rs

ed2b6b8

Co-authored-by: Alec Edgington <54802828+cqc-alec@users.noreply.github.com>

Update hugr-llvm/src/extension/collections/static_array.rs

cc016e7

Co-authored-by: Alec Edgington <54802828+cqc-alec@users.noreply.github.com>

wip

7e1e001

wip

6aebe1d

oops

94e2d30

Merge branch 'main' of gh:CQCL-DEV/hugr into doug/static-arrays-llvm

f1d8d6b

Merge branch 'doug/static-arrays-py-fix' of gh:CQCL-DEV/hugr into dou…

aaf7bdc

…g/static-arrays-llvm

address comments

1264b4e

Merge branch 'doug/static-arrays-llvm' of gh:CQCL-DEV/hugr into doug/…

d4a8cf9

…static-arrays-llvm

doug-q requested a review from cqc-alec March 20, 2025 14:19

cqc-alec reviewed Mar 20, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add llvm codegen for collections.static_array #2003

feat: Add llvm codegen for collections.static_array #2003

doug-q commented Mar 19, 2025

codecov bot commented Mar 19, 2025 •

edited

Loading

doug-q commented Mar 19, 2025

cqc-alec Mar 20, 2025

cqc-alec Mar 20, 2025

doug-q Mar 20, 2025

cqc-alec Mar 20, 2025

doug-q commented Mar 20, 2025

hugrbot commented Mar 20, 2025

cqc-alec left a comment

doug-q commented Mar 20, 2025

feat: Add llvm codegen for collections.static_array #2003

Are you sure you want to change the base?

feat: Add llvm codegen for collections.static_array #2003

Conversation

doug-q commented Mar 19, 2025

codecov bot commented Mar 19, 2025 • edited Loading

Codecov Report

doug-q commented Mar 19, 2025

cqc-alec Mar 20, 2025

Choose a reason for hiding this comment

cqc-alec Mar 20, 2025

Choose a reason for hiding this comment

doug-q Mar 20, 2025

Choose a reason for hiding this comment

cqc-alec Mar 20, 2025

Choose a reason for hiding this comment

doug-q commented Mar 20, 2025

hugrbot commented Mar 20, 2025

cqc-alec left a comment

Choose a reason for hiding this comment

doug-q commented Mar 20, 2025

codecov bot commented Mar 19, 2025 •

edited

Loading