Ship tag check fix#698
Merged
ngober merged 10 commits intoChampSim:developfrom Mar 16, 2026
Merged
Conversation
…shamt, add regression test Co-authored-by: maccoymerrell <[email protected]>
… shamt-based slice_upper Co-authored-by: maccoymerrell <[email protected]>
Use block_number for SHIP sampler tag comparison
Remove dangling variables that were never exercised by the test: - mock_ll (do_nothing_MRC) and mock_ul (to_rq_MRP): only used to construct the cache, but CACHE can be built without them - .upper_levels() and .lower_level(): mock-dependent cache builder calls - .replacement<lru>(): cache replacement policy never used - cache.initialize(), cache.warmup, cache.begin_phase(): cache never operated on; only NUM_SET/NUM_WAY are needed by the ship constructor - #include "mocks.hpp": no longer needed Co-authored-by: maccoymerrell <[email protected]>
…externally Pass ship as the replacement template argument to the cache builder, then access the internal ship instance via dynamic_cast on the public repl_module_pimpl for test assertions. Co-authored-by: maccoymerrell <[email protected]>
…t-variables Clean up SHIP sampler tag test: remove dangling variables, use cache-owned replacement policy
ngober
reviewed
Mar 16, 2026
github-actions Bot
added a commit
that referenced
this pull request
Mar 16, 2026
Author: maccoymerrell Committer: GitHub Ship tag check fix (#698) The previous implementation of the sampler-set tag check mechanism was convoluted, and would result in false matches / false mismatches under some cache configurations. This pr simplifies the check to the block number, functionally equivalent to what should have been implemented but far simpler and avoids any confusion or potential bugs by introducing additional slicing to remove variable amounts of set index and sampler index bits. A test was added to ensure the matcher was behaving properly. Fixes issue raised in #697 --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]>
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.
The previous implementation of the sampler-set tag check mechanism was convoluted, and would result in false matches / false mismatches under some cache configurations.
This pr simplifies the check to the block number, functionally equivalent to what should have been implemented but far simpler and avoids any confusion or potential bugs by introducing additional slicing to remove variable amounts of set index and sampler index bits.
A test was added to ensure the matcher was behaving properly.
Fixes issue raised in #697