Gitflow Clean Up

.gitignore

@@ -1,6 +1,7 @@
 build/
 lib/
 CMakeUserPresets.json
+build-*kraken*/
 
 
 # Created by https://www.toptal.com/developers/gitignore/api/c,c++,git,vim,cmake,linux,macos,windows,archives,assembler,jetbrains+all,visualstudiocode,conan

.vscode/settings.json

@@ -0,0 +1,72 @@
+{
+    "files.associations": {
+        "*.v": "coq",
+        "any": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "forward_list": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "format": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "ostream": "cpp",
+        "ranges": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp",
+        "valarray": "cpp",
+        "variant": "cpp"
+    }
+}

CMakeLists.txt

@@ -15,9 +15,9 @@ include(./target/${SIMULATOR}/${SIMULATOR}.cmake)
 
 # Setup include paths
 include_directories(.)
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wno-error=maybe-uninitialized -Wno-error=dangling-pointer -fdiagnostics-color=always -g3 -gdwarf-5")
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -fdiagnostics-color=always -g3 -gdwarf-5")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -fno-eliminate-unused-debug-symbols -fno-omit-frame-pointer -funroll-loops -fno-inline -fno-lto")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -march=native")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -march=native -fno-omit-frame-pointer")
 
 # Find boost
 set(Boost_USE_DEBUG_LIBS OFF)

components/BranchPredictor/BTBSet.cpp

@@ -24,9 +24,13 @@ BTBSet::BTBSet(uint32_t associativity)
 void
 BTBSet::updateReplacementQueue(uint32_t index)
 {
-    replacementQueue.erase(std::remove(replacementQueue.begin(), replacementQueue.end(), index),
-                           replacementQueue.end());
-    replacementQueue.insert(replacementQueue.end(), index);
+    for (auto i = replacementQueue.begin(); i != replacementQueue.end(); ++i)
+        if (*i == index) {
+            replacementQueue.erase(i);
+            break;
+        }
+
+    replacementQueue.push_back(index);
 }
 
 bool
@@ -56,10 +60,17 @@ BTBSet::access(VirtualMemoryAddress anAddress)
 void
 BTBSet::insert(BTBEntry btbEntry)
 {
-    // TODO: Replacement is not needed if there is an invalid entry
-    uint32_t replacementQueueIndex = replacementQueue[0];
-    blocks[replacementQueueIndex]  = btbEntry;
-    updateReplacementQueue(replacementQueueIndex);
+    for (uint32_t i = 0; i < blocks.size(); ++i) {
+        if (!blocks[i].valid) {
+            blocks[i] = btbEntry;
+            updateReplacementQueue(i);
+            return;
+        }
+    }
+
+    uint32_t index = replacementQueue.front();
+    blocks[index] = btbEntry;
+    updateReplacementQueue(index);
 }
 
 // [MADHUR] Invalidate entry if present