fix(test): resolve cxxopts option collision in dma_complex_dims#3028
Merged
fifield merged 4 commits intoXilinx:mainfrom Apr 21, 2026
Merged
fix(test): resolve cxxopts option collision in dma_complex_dims#3028fifield merged 4 commits intoXilinx:mainfrom
fifield merged 4 commits intoXilinx:mainfrom
Conversation
The Boost-to-cxxopts migration (Xilinx#2234) introduced two bugs that hid behind a single XFAIL: 1. Option name collision: test.cpp registered "k" as a cxxopts option, which conflicts with test_utils.cpp's "kernel,k" -- both claim the -k short option, causing option_already_exists at parse time. Renamed to "tile-k" (long-only) to avoid the collision. 2. Double-dash syntax: the RUN line used --m, --K, --r, --s for single-char options. cxxopts rejects double-dash for single-char names (unlike Boost). Changed to single-dash -m, -K, -r, -s. Test verified on NPU1 hardware with Peano: PASS. Closes Xilinx#2470 (last remaining test in that issue). Generated using Claude Code.
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes dma_complex_dims NPU/XRT test failures caused by cxxopts behavior differences after the Boost→cxxopts migration, and re-enables the test by removing its blanket XFAIL.
Changes:
- Avoid
-kshort-option collision by renaming the test’s tile-dimension option fromkto long-onlytile-k. - Update the lit RUN line to use single-dash syntax for single-character options (
-m,-K,-r,-s) as required bycxxopts. - Remove the
# XFAIL: *marker now that the test passes.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| test/npu-xrt/dma_complex_dims/test.cpp | Renames the k CLI option to tile-k and updates parsing to match. |
| test/npu-xrt/dma_complex_dims/aie2.py | Removes XFAIL and fixes RUN-line option syntax / updated tile-k flag usage. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jgmelber
approved these changes
Apr 11, 2026
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
The previous commit disabled xchesscc for kernel compilation but forgot --no-xbridge, so the linking step still went through xchesscc_wrapper. This caused a segfault on CI's older aietools (v2024.2) during xbridge linking. Other Peano-only tests already pass both flags together. Generated using Claude Code.
Contributor
Author
|
CI still seems green so far, is this ready to merge? |
joeldushouyu
pushed a commit
to joeldushouyu/mlir-aie
that referenced
this pull request
Apr 24, 2026
…nx#3028) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
cxxoptsinstead of Boost #2234) that wereboth hiding behind a single XFAIL:
test.cppregistered"k"which conflicts withtest_utils.cpp's"kernel,k"-- both claim-k, causingoption_already_existsat parse time. Renamed to"tile-k"(long-only).--m,--K,--r,--sforsingle-char options. cxxopts rejects
--for single-char names (unlikeBoost). Changed to
-m,-K,-r,-s.Closes #2470 (last remaining test in that issue).
Test plan
--helpshows correct options, no collision