Skip to content

[Origami] Origami change for batch_count > 0#3289

Merged
pghysels merged 7 commits into
developfrom
users/pghysels/origami_fixes
Jan 8, 2026
Merged

[Origami] Origami change for batch_count > 0#3289
pghysels merged 7 commits into
developfrom
users/pghysels/origami_fixes

Conversation

@pghysels
Copy link
Copy Markdown
Contributor

@pghysels pghysels commented Dec 10, 2025

Motivation

Technical Details

Fixes for batch_count > 1.

This affects solution selection and performance.

Test Plan

Testing locally. Changes should be covered by existing tests.

Test Result

Tests pass locally.

Submission Checklist

iq136boy pushed a commit that referenced this pull request Dec 10, 2025
* [CK TILE] Grouped Conv Explicit Gemm

* fixes

* apply builder fixes
Comment thread shared/origami/src/origami/gemm.cpp Outdated
Comment thread shared/origami/src/origami/gemm.cpp Outdated
Comment thread shared/origami/src/origami/gemm.cpp
Comment thread shared/origami/src/origami/gemm.cpp Outdated
@pghysels pghysels force-pushed the users/pghysels/origami_fixes branch from 9409852 to 5a50053 Compare December 16, 2025 19:25
minsukim-amd added a commit that referenced this pull request Dec 18, 2025
## Testing Plan
- Azure CI (deprecated): Runs all the Catch2 and new Python tests. ✅ 
- TheRock CI (integration): 
- CI workflow: https://github.com/ROCm/TheRock/actions/runs/20316557318
✅
- TheRock branch:
https://github.com/ROCm/TheRock/tree/users/neoblizz/minsukim-refactor ✅
(Some tests fail but build passed)
- TheRock CI (libraries: hipblaslt, etc.) ✅ 
- Math CI (performance/hipblaslt) ✅ 
- Reviews from older PRs are addressed with the few exceptions. ✅ 

## PRs History
- Original PR: #1859
- Rebased PR: #2718
- Reverted PR:
#3416 (comment)
- Hot-fix PR:
#3417 (review)
([TheRock CI
Report](https://github.com/ROCm/TheRock/actions/runs/20293546191))
- **And now this!**

## Technical Details

### Refactor
- [x] New file `types.hpp`, consolidates various origami types.
- [x] New structs to replace the growing tuple.
- [x] API updates to make it scalable, down from 20+ parameters to a
few.
- [x] Lots of redundant code removal.
- [x] Reorganize into `types.hpp`; data types (see `hardware.hpp` for
what needs to be moved)
- [x] Refactor extract APIs
- [x] Add enums for transpose
- [x] Refactor debug/log reporting
- [x] Remove mutable and statics
- [x] Decouple `latency` out of `config_t` 
- [x] Rebase develop into this branch

### Python APIs & Unit Tests
- [x] Update the tests
- [x] Update rocroller
- [x] hipblaslt/tensilelite/scripts to use the new API

### Testing Infrastructure
- Replace YAML-based tests with Catch2 C++ tests
- Replace GTest with Catch2 framework
- Convert YAML-driven parameterized tests to pure C++ tests
- Update common.hpp with direct C++ helper functions
- Update CMakeLists.txt to use Catch2 instead of GTest
- Remove Boost dependency (was only for YAML)
- All test data now hardcoded in C++ for type safety
- Better IDE support, debugging, and error messages

### Questions
- Rocroller: coordinate on the API design, should they be reused?
- Reuse dim3_t from hip_runtime.h (does HIP's dim3 have the same
functionality)?
- Should transpose/data-types be part of config as well for
precomputing?

## Motivation

This PR reapplies Origami project's refactor.

1. Make it simpler to make model updates.
2. Well-defined, scalable, clean interface.

## Submission Checklist

- [x] Look over the contributing guidelines at
https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.

## Work Moved to Future PRs

- Logger APIs
- Runtime Options
- Move instruction map into separate file
- Additional tests: #3301
- Minor batch-count specific changes:
#3289
- Move Origami's Azure CI -> TheRock CI @ibrahimw1

---------

Co-authored-by: Brad Nemanich <Brad.Nemanich@amd.com>
Co-authored-by: neoblizz <osama94@gmail.com>
@pghysels pghysels force-pushed the users/pghysels/origami_fixes branch from cd9875f to ef30ad7 Compare December 20, 2025 01:17
@pghysels pghysels changed the title [Origami] Various minor Origami changes [Origami] Few minor Origami changes Dec 20, 2025
@pghysels pghysels changed the title [Origami] Few minor Origami changes [Origami] Origami change for batch_count > 0 Dec 20, 2025
@pghysels pghysels marked this pull request as ready for review December 20, 2025 01:59
@pghysels pghysels requested a review from a team as a code owner December 20, 2025 01:59
@pghysels pghysels force-pushed the users/pghysels/origami_fixes branch from c41ad2a to b776405 Compare January 5, 2026 17:46
@math-ci-jobs
Copy link
Copy Markdown

math-ci-jobs Bot commented Jan 5, 2026

perfci run on commit 24f3c568d23dda3e1b4d222b377b31f175c884ef

math-ci run

@neoblizz neoblizz requested a review from aliry95amd January 5, 2026 19:37
@ryanswann-amd ryanswann-amd self-requested a review January 5, 2026 20:25
@pghysels pghysels force-pushed the users/pghysels/origami_fixes branch from b776405 to 61436df Compare January 6, 2026 21:40
@math-ci-jobs
Copy link
Copy Markdown

math-ci-jobs Bot commented Jan 6, 2026

perfci run on commit 61436df50a39ec24862f97d3ce3fc73890f65331

math-ci run

@pghysels pghysels force-pushed the users/pghysels/origami_fixes branch from 61436df to fad7069 Compare January 7, 2026 19:50
@math-ci-jobs
Copy link
Copy Markdown

math-ci-jobs Bot commented Jan 7, 2026

perfci run on commit cf1952e

math-ci run

@pghysels pghysels merged commit 57f896b into develop Jan 8, 2026
39 checks passed
@pghysels pghysels deleted the users/pghysels/origami_fixes branch January 8, 2026 04:09
ammallya pushed a commit that referenced this pull request Feb 3, 2026
* [CK TILE] Grouped Conv Explicit Gemm

* fixes

* apply builder fixes

[ROCm/composable_kernel commit: 00dfa2f]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants