clang format the whole desesc

core/cachecore.hpp

@@ -184,7 +184,7 @@ class CacheGeneric {
     return line;
   }
 
-  CacheLine *fillLine(Addr_t addr, Addr_t pc=0) {
+  CacheLine *fillLine(Addr_t addr, Addr_t pc = 0) {
     CacheLine *l = findLine2Replace(addr, pc, false);
     I(l);
 
@@ -275,7 +275,7 @@ class HawkCache : public CacheGeneric<State, Addr_t> {
   typedef typename CacheGeneric<State, Addr_t>::CacheLine Line;
 
 protected:
-  std::vector<Line>  mem;
+  std::vector<Line> mem;
   Line            **content;
   uint16_t          irand;
   ReplacementPolicy policy;
@@ -313,9 +313,7 @@ class HawkCache : public CacheGeneric<State, Addr_t> {
   Line *findLinePrivate(Addr_t addr, Addr_t pc = 0);
 
 public:
-  virtual ~HawkCache() {
-    delete[] content;
-  }
+  virtual ~HawkCache() { delete[] content; }
 
   // TODO: do an iterator. not this junk!!
   Line *getPLine(uint32_t l) {
@@ -354,7 +352,7 @@ class CacheAssoc : public CacheGeneric<State, Addr_t> {
   typedef typename CacheGeneric<State, Addr_t>::CacheLine Line;
 
 protected:
-  std::vector<Line>  mem;
+  std::vector<Line> mem;
   Line            **content;
   uint16_t          irand;
   ReplacementPolicy policy;
@@ -420,9 +418,7 @@ class CacheAssoc : public CacheGeneric<State, Addr_t> {
   Line *findLinePrivate(Addr_t addr, Addr_t pc = 0);
 
 public:
-  virtual ~CacheAssoc() {
-    delete[] content;
-  }
+  virtual ~CacheAssoc() { delete[] content; }
 
   // TODO: do an iterator. not this junk!!
   Line *getPLine(uint32_t l) {
@@ -444,8 +440,8 @@ class CacheDM : public CacheGeneric<State, Addr_t> {
   typedef typename CacheGeneric<State, Addr_t>::CacheLine Line;
 
 protected:
-  std::vector<Line>  mem;
-  Line **content;
+  std::vector<Line> mem;
+  Line            **content;
 
   friend class CacheGeneric<State, Addr_t>;
   CacheDM(int32_t size, int32_t blksize, int32_t addrUnit, const std::string &pStr, bool xr);
@@ -454,9 +450,7 @@ class CacheDM : public CacheGeneric<State, Addr_t> {
   Line *findLinePrivate(Addr_t addr, Addr_t pc = 0);
 
 public:
-  virtual ~CacheDM() {
-    delete[] content;
-  };
+  virtual ~CacheDM() { delete[] content; };
 
   // TODO: do an iterator. not this junk!!
   Line *getPLine(uint32_t l) {
@@ -478,8 +472,8 @@ class CacheDMSkew : public CacheGeneric<State, Addr_t> {
   typedef typename CacheGeneric<State, Addr_t>::CacheLine Line;
 
 protected:
-  std::vector<Line>  mem;
-  Line **content;
+  std::vector<Line> mem;
+  Line            **content;
 
   friend class CacheGeneric<State, Addr_t>;
   CacheDMSkew(int32_t size, int32_t blksize, int32_t addrUnit, const std::string &pStr);
@@ -488,9 +482,7 @@ class CacheDMSkew : public CacheGeneric<State, Addr_t> {
   Line *findLinePrivate(Addr_t addr, Addr_t pc = 0);
 
 public:
-  virtual ~CacheDMSkew() {
-    delete[] content;
-  };
+  virtual ~CacheDMSkew() { delete[] content; };
 
   // TODO: do an iterator. not this junk!!
   Line *getPLine(uint32_t l) {
@@ -514,7 +506,7 @@ class CacheSHIP : public CacheGeneric<State, Addr_t> {
   typedef typename CacheGeneric<State, Addr_t>::CacheLine Line;
 
 protected:
-  std::vector<Line>  mem;
+  std::vector<Line> mem;
   Line            **content;
   uint16_t          irand;
   ReplacementPolicy policy;
@@ -775,8 +767,9 @@ CacheGeneric<State, Addr_t> *CacheGeneric<State, Addr_t>::create(const std::stri
   CacheGeneric *cache = 0;
 
   auto fmt_append{append};
-  if (!fmt_append.empty())
+  if (!fmt_append.empty()) {
     fmt_append += "_";
+  }
 
   auto size_sec        = fmt::format("{}size", fmt_append);
   auto line_size_sec   = fmt::format("{}line_size", fmt_append);
@@ -867,11 +860,11 @@ CacheAssoc<State, Addr_t>::CacheAssoc(int32_t size, int32_t assoc, int32_t blksi
   zero_line.invalidate();
   zero_line.rrip = 0;
 
-  mem.resize(numLines+1, zero_line);
+  mem.resize(numLines + 1, zero_line);
   content = new Line *[numLines + 1];
 
   for (uint32_t i = 0; i < numLines; i++) {
-    content[i]  = &mem[i];
+    content[i] = &mem[i];
   }
 
   irand = 0;
@@ -1210,11 +1203,11 @@ HawkCache<State, Addr_t>::HawkCache(int32_t size, int32_t assoc, int32_t blksize
   zero_line.initialize(this);
   zero_line.invalidate();
 
-  mem.resize(numLines+1, zero_line);
+  mem.resize(numLines + 1, zero_line);
   content = new Line *[numLines + 1];
 
   for (uint32_t i = 0; i < numLines; i++) {
-    content[i]  = &mem[i];
+    content[i] = &mem[i];
   }
 
   irand = 0;
@@ -1494,11 +1487,11 @@ CacheDM<State, Addr_t>::CacheDM(int32_t size, int32_t blksize, int32_t addrUnit,
   zero_line.initialize(this);
   zero_line.invalidate();
 
-  mem.resize(numLines+1, zero_line);
+  mem.resize(numLines + 1, zero_line);
   content = new Line *[numLines + 1];
 
   for (uint32_t i = 0; i < numLines; i++) {
-    content[i]  = &mem[i];
+    content[i] = &mem[i];
   }
 }
 
@@ -1543,11 +1536,11 @@ CacheDMSkew<State, Addr_t>::CacheDMSkew(int32_t size, int32_t blksize, int32_t a
   zero_line.initialize(this);
   zero_line.invalidate();
 
-  mem.resize(numLines+1, zero_line);
+  mem.resize(numLines + 1, zero_line);
   content = new Line *[numLines + 1];
 
   for (uint32_t i = 0; i < numLines; i++) {
-    content[i]  = &mem[i];
+    content[i] = &mem[i];
   }
 }
 
@@ -1711,11 +1704,11 @@ CacheSHIP<State, Addr_t>::CacheSHIP(int32_t size, int32_t assoc, int32_t blksize
   zero_line.initialize(this);
   zero_line.invalidate();
 
-  mem.resize(numLines+1, zero_line);
+  mem.resize(numLines + 1, zero_line);
   content = new Line *[numLines + 1];
 
   for (uint32_t i = 0; i < numLines; i++) {
-    content[i]  = &mem[i];
+    content[i] = &mem[i];
   }
 
   for (uint32_t j = 0; j < (2 ^ log2shct); j++) {

core/cachecore_bench.cpp

@@ -1,6 +1,5 @@
 
 #include "benchmark/benchmark.h"
-
 #include "cachecore.hpp"
 #include "config.hpp"
 #include "report.hpp"
@@ -13,7 +12,7 @@ class SampleState : public StateGeneric<long> {
   bool operator==(SampleState s) const { return id == s.id; }
 };
 
-using MyCacheType=CacheGeneric<SampleState, long>;
+using MyCacheType = CacheGeneric<SampleState, long>;
 
 MyCacheType *cache;
 
@@ -33,7 +32,7 @@ void endBench(const char *str) {
 
   double usecs = (endTime.tv_sec - stTime.tv_sec) * 1000000 + (endTime.tv_usec - stTime.tv_usec);
 
-  fprintf(stderr, "%s: %8.2f Maccesses/s %7.3f%%\n", str, nAccess / usecs, 100 * nMisses / nAccess);
+  fmt::print("{}: {} Maccesses/s {}%\n", str, nAccess / usecs, 100 * nMisses / nAccess);
 }
 
 #define MSIZE 256
@@ -43,7 +42,6 @@ double B[MSIZE][MSIZE];
 double C[MSIZE][MSIZE];
 
 void benchMatrix(const char *str) {
-
   startBench();
 
   MyCacheType::CacheLine *line;
@@ -123,8 +121,7 @@ static void setup_config() {
   file.close();
 }
 
-static void BM_cachecore(benchmark::State& state) {
-
+static void BM_cachecore(benchmark::State &state) {
   Report::init();
   Config::init("cachecore.toml");
 
@@ -136,7 +133,7 @@ static void BM_cachecore(benchmark::State& state) {
 
     MyCacheType::CacheLine *line = cache->findLine(addr);
     if (line) {
-      fprintf(stderr, "ERROR: Line 0x%lX (0x%lX) found\n", cache->calcAddr4Tag(line->getTag()), addr);
+      fmt::print("ERROR: Line {:x} ({:x}) found\n", cache->calcAddr4Tag(line->getTag()), addr);
       exit(-1);
     }
     line     = cache->fillLine(addr);
@@ -148,16 +145,15 @@ static void BM_cachecore(benchmark::State& state) {
 
     MyCacheType::CacheLine *line = cache->findLine(addr);
     if (line == 0) {
-      fprintf(stderr, "ERROR: Line (0x%lX) NOT found\n", addr);
+      fmt::print("ERROR: Line ({:x}) NOT found\n", addr);
       exit(-1);
     }
     if (line->id != i) {
-      fprintf(stderr,
-              "ERROR: Line 0x%lX (0x%lX) line->id %d vs id %d (bad LRU policy)\n",
-              cache->calcAddr4Tag(line->getTag()),
-              addr,
-              line->id,
-              i);
+      fmt::print("ERROR: Line {:x} ({:x}) line->id {} vs id {} (bad LRU policy)\n",
+                 cache->calcAddr4Tag(line->getTag()),
+                 addr,
+                 line->id,
+                 i);
       exit(-1);
     }
   }
@@ -178,9 +174,8 @@ BENCHMARK(BM_cachecore)->Arg(2);
 BENCHMARK(BM_cachecore)->Arg(4);
 #endif
 
-int main(int argc, char* argv[]) {
+int main(int argc, char *argv[]) {
   setup_config();
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();
 }
-

core/callback.hpp

@@ -5,11 +5,11 @@
 #include <algorithm>  // std::find()..
 #include <vector>     // std::vector<>
 
-#include "tqueue.hpp"
 #include "fmt/format.h"
 #include "iassert.hpp"
 #include "pool.hpp"
 #include "snippets.hpp"
+#include "tqueue.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 //

core/config.cpp

@@ -31,7 +31,7 @@ void Config::exit_on_error() {
     fmt::print("ERROR:{}\n", e);
   }
 
-  abort(); // Abort no exit to avoid the likely seg-faults of a bad configuration
+  abort();  // Abort no exit to avoid the likely seg-faults of a bad configuration
 }
 
 bool Config::check(const std::string &block, const std::string &name) {
@@ -193,10 +193,11 @@ int Config::get_integer(const std::string &block, const std::string &name, int f
     return 0;
   }
 
-  if (ent.is_integer())
+  if (ent.is_integer()) {
     val = ent.as_integer();
-  else
+  } else {
     val = ent.as_floating();
+  }
 
   if (val < from || val > to) {
     errors.emplace_back(fmt::format("conf:{} section:{} field:{} value:{} is not allowed range ({}..<={})\n",
@@ -236,10 +237,11 @@ int Config::get_integer(const std::string &block, const std::string &name, size_
     return 0;
   }
 
-  if (ent2.is_integer())
+  if (ent2.is_integer()) {
     val = ent2.as_integer();
-  else
+  } else {
     val = ent2.as_floating();
+  }
 
   if (val < from || val > to) {
     errors.emplace_back(fmt::format("conf:{} section:{} field:{} value:{} is not allowed range ({}..<={})\n",
@@ -302,10 +304,11 @@ int Config::get_array_integer(const std::string &block, const std::string &name,
   }
 
   int val;
-  if (arr[pos].is_integer())
+  if (arr[pos].is_integer()) {
     val = arr[pos].as_integer();
-  else
+  } else {
     val = arr[pos].as_floating();
+  }
 
   add_used(block, name, pos, fmt::format("{}", val));
   return val;

core/fastqueue.hpp

@@ -74,5 +74,5 @@ class FastQueue {
   Data topNext() const { return getData(getIDFromTop(1)); }
 
   std::size_t size() const { return nElems; }
-  bool   empty() const { return nElems == 0; }
+  bool        empty() const { return nElems == 0; }
 };

core/pool_bench.cpp

@@ -10,10 +10,10 @@
 
 #include <vector>
 
-#include "threadsafefifo.hpp"
 #include "iassert.hpp"
 #include "pool.hpp"
 #include "snippets.hpp"
+#include "threadsafefifo.hpp"
 
 class DummyObjTest {
   int32_t c;

core/report.cpp

@@ -35,12 +35,12 @@ void Report::init() {
 }
 
 const std::string Report::get_extension() {
-
   auto pos = report_file.rfind('.');
-  if (pos == std::string::npos)
+  if (pos == std::string::npos) {
     return "";
+  }
 
-  return report_file.substr(pos+1);
+  return report_file.substr(pos + 1);
 }
 
 void Report::reinit() {

core/report.hpp

@@ -7,7 +7,7 @@
 class Report {
 private:
   static inline std::string report_file;
-  static inline int fd = -1;
+  static inline int         fd = -1;
 
 public:
   static void init();

core/snippets.cpp

@@ -1,8 +1,9 @@
 // See LICENSE for details.
 
+#include "snippets.hpp"
+
 #include <typeinfo>
 
-#include "snippets.hpp"
 #include "iassert.hpp"
 
 int16_t log2i(uint32_t n) {