Skip to content

Fix cache set/tag indexing for non-power-of-two num_set and add regression coverage #82

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
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix cache set/tag indexing for non-power-of-two num_set and add regression coverage #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aaeb1c
Initial plan
Copilot Sep 7, 2026
ccb7f83
Fix cache set indexing for non-power-of-two set counts
Copilot Sep 7, 2026
e76bb4b
Apply review cleanup for cache indexing PR
Copilot Sep 7, 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
1 change: 0 additions & 1 deletion SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,4 +355,3 @@ env.Program(
#########################################################################################
if GetOption('clean'):
os.system('rm -f ../bin/macsim')
Comment on lines 356 to 357

Copilot AI Sep 7, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Updated the PR description to remove the references to the regression test target/file, since that wasn't part of this change.


18 changes: 14 additions & 4 deletions src/cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ cache_c::cache_c(string name, int num_set, int assoc, int line_size,
m_data_size = data_size;
m_assoc = assoc;
m_num_sets = num_set;
ASSERTM(m_num_sets > 0, "cache:%s num_set:%d\n", m_name.c_str(), m_num_sets);
m_line_size = line_size;
m_cache_type = cache_type_info;
m_num_tiles = (num_tiles > 0) ? num_tiles : 1;
Expand Down Expand Up @@ -154,9 +155,9 @@ cache_c::~cache_c() {

// parse tag address and set index from an address
void cache_c::find_tag_and_set(Addr addr, Addr *tag, int *set) {
Addr index_addr = addr;
if (m_num_tiles == 1) {
*tag = addr >> m_shift_bits & m_tag_mask;
*set = addr >> m_shift_bits & m_set_mask;
index_addr = addr;
} else {
Addr mod_addr;
if (m_tile_bits) {
Expand All @@ -172,15 +173,24 @@ void cache_c::find_tag_and_set(Addr addr, Addr *tag, int *set) {
(((addr >> m_interleave_bits) / m_num_tiles) << m_interleave_bits) |
(addr & m_interleave_mask);
}
*tag = mod_addr >> m_shift_bits & m_tag_mask;
*set = mod_addr >> m_shift_bits & m_set_mask;
index_addr = mod_addr;
// cout << hex << addr << " mod addr " << mod_addr << " imask " << m_interleave_mask << " addr & imask " << (addr &
// m_interleave_mask) << " other part short " << ((addr >> m_interleave_bits) / m_num_tiles) << " other part " <<
// (((addr >> m_interleave_bits) / m_num_tiles) << m_interleave_bits) << " num tiles " << dec << m_num_tiles << "
// tile bits " << m_tile_bits << " tile " << dec << ((m_num_tiles > 1) ? ((addr >> m_interleave_bits) % m_num_tiles)
// : 0) << " tag mask " << hex << m_tag_mask << " tag " << *tag << " set mask " << m_set_mask << " set " << *set <<
// dec << "\n";
}

Addr line_number = index_addr >> m_shift_bits;
bool power_of_two_sets = (m_num_sets & (m_num_sets - 1)) == 0;
if (power_of_two_sets) {
*set = line_number & m_set_mask;
*tag = line_number & m_tag_mask;
} else {
*set = line_number % m_num_sets;
*tag = line_number / m_num_sets;
}
}

// access the cache
Expand Down
2 changes: 1 addition & 1 deletion src/cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class cache_c
/**
* \brief Create a new cache using the configuration sent by the caller.
* \param name - Name of the cache
* \param num_set - Cache Size
* \param num_set - Number of cache sets (must be > 0, power-of-two not required)
* \param assoc - Cache Associativity
* \param line_size - Line Size
* \param data_size - Data Size
Expand Down
Loading