Skip to content

Commit

Permalink
Merge Pull Request sstsimulator#1911 from jpkenny/sst-elements/fix-uint
Browse files Browse the repository at this point in the history
Automatically Merged using SST Pull Request AutoTester
PR Title: b'Remove usage of "uint" from cassini. Addresses issue sstsimulator#1909'
PR Author: jpkenny
  • Loading branch information
sst-autotester authored Jun 22, 2022
2 parents 2162069 + 4ffb611 commit e1d5c75
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/sst/elements/cassini/cacheLineTrack.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ cacheLineTrack::cacheLineTrack(ComponentId_t id, Params& params) : CacheListener

rdHisto = registerStatistic<Addr>("hist_reads_log2");
wrHisto = registerStatistic<Addr>("hist_writes_log2");
useHisto = registerStatistic<uint>("hist_word_accesses");
useHisto = registerStatistic<unsigned int>("hist_word_accesses");
ageHisto = registerStatistic<SimTime_t>("hist_age_log2");
evicts = registerStatistic<uint>("evicts");
evicts = registerStatistic<unsigned int>("evicts");

}

Expand Down Expand Up @@ -107,7 +107,7 @@ void cacheLineTrack::notifyAccess(const CacheListenerNotification& notify) {
wrHisto->addData(log2_64(iter->second.writes));
SimTime_t now = getSimulation()->getCurrentSimCycle();
ageHisto->addData(log2_64(now - iter->second.entered));
uint touched = iter->second.touched.count();
unsigned int touched = iter->second.touched.count();
useHisto->addData(touched);
evicts->addData(1);
//delete it
Expand Down
4 changes: 2 additions & 2 deletions src/sst/elements/cassini/cacheLineTrack.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ class cacheLineTrack : public SST::MemHierarchy::CacheListener {
// heap and the stack.
Statistic<Addr>* rdHisto;
Statistic<Addr>* wrHisto;
Statistic<uint>* useHisto;
Statistic<unsigned int>* useHisto;
Statistic<SimTime_t>* ageHisto;
Statistic<uint>* evicts;
Statistic<unsigned int>* evicts;
};

}
Expand Down

0 comments on commit e1d5c75

Please sign in to comment.