add clang-tidy fixes for version 1.18

tud-zih-energy · Jan 17, 2025 · 4dd5516 · 4dd5516
1 parent 6221f39
commit 4dd5516
Show file tree

Hide file tree

Showing 45 changed files with 294 additions and 40 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -60,5 +60,6 @@ CheckOptions:
   - { key: readability-implicit-bool-conversion.AllowPointerConditions,  value: 1 }
   - { key: readability-function-cognitive-complexity.IgnoreMacros,  value: 1 }
   - { key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: "true" }
-  # disable warnings is asmjit
-  - { key: 'clang-analyzer-optin.cplusplus.UninitializedObject:IgnoreRecordsWithField', value: 'asmjit::Operand_::Signature' }
+  # disable warnings is external libraries
+  - { key: 'clang-analyzer-optin.cplusplus.UninitializedObject:IgnoreRecordsWithField', value: 'asmjit::Operand_::Signature' }
+  - { key: 'misc-include-cleaner.IgnoreHeaders', value: '.*asmjit.*;.*hwloc.*' }
diff --git a/include/firestarter/CPUTopology.hpp b/include/firestarter/CPUTopology.hpp
@@ -25,6 +25,7 @@
 #include <set>
 
 extern "C" {
+// NOLINTNEXTLINE(misc-header-include-cycle) internal cycle inside hwloc
 #include <hwloc.h>
 }
 

diff --git a/include/firestarter/DumpRegisterWorkerData.hpp b/include/firestarter/DumpRegisterWorkerData.hpp
@@ -65,7 +65,7 @@ class DumpRegisterWorkerData {
   /// which the registers are dumped as well as getting the size and count of registers.
   std::shared_ptr<LoadWorkerData> LoadWorkerDataPtr;
   /// Every this number of seconds the register content will be dumped.
-  const std::chrono::seconds DumpTimeDelta;
+  std::chrono::seconds DumpTimeDelta;
   /// The folder in which the hamming_distance.csv file will be created.
   std::string DumpFilePath;
 };

diff --git a/include/firestarter/Payload/PayloadSettings.hpp b/include/firestarter/Payload/PayloadSettings.hpp
@@ -185,8 +185,7 @@ struct PayloadSettings {
 
   /// The available instruction cache size. This refers to the L1i-Cache per thread on the physical CPU core.
   [[nodiscard]] auto instructionCacheSizePerThread() const -> std::optional<unsigned> {
-    auto InstructionCacheSize = this->InstructionCacheSize;
-    if (*InstructionCacheSize) {
+    if (InstructionCacheSize) {
       return *InstructionCacheSize / thread();
     }
     return {};

diff --git a/include/firestarter/Platform/PlatformConfig.hpp b/include/firestarter/Platform/PlatformConfig.hpp
@@ -131,8 +131,9 @@ class PlatformConfig {
                 << " thread(s) per core\n"
                 << "  Used buffersizes per thread:";
 
-    if (settings().instructionCacheSizePerThread()) {
-      log::info() << "    - L1i-Cache: " << *settings().instructionCacheSizePerThread() << " Bytes";
+    const auto ICacheSizePerThread = settings().instructionCacheSizePerThread();
+    if (ICacheSizePerThread) {
+      log::info() << "    - L1i-Cache: " << *ICacheSizePerThread << " Bytes";
     }
 
     unsigned I = 1;

diff --git a/include/firestarter/ProcessorInformation.hpp b/include/firestarter/ProcessorInformation.hpp
@@ -30,10 +30,6 @@
 #include <sstream>
 #include <string>
 
-extern "C" {
-#include <hwloc.h>
-}
-
 namespace firestarter {
 
 /// This class models the properties of a processor.

diff --git a/include/firestarter/X86/Payload/AVX512Payload.hpp b/include/firestarter/X86/Payload/AVX512Payload.hpp
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include "firestarter/Payload/PayloadSettings.hpp"
 #include "firestarter/X86/Payload/X86Payload.hpp"
 
 namespace firestarter::x86::payload {

diff --git a/include/firestarter/X86/Payload/AVXPayload.hpp b/include/firestarter/X86/Payload/AVXPayload.hpp
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include "firestarter/Payload/PayloadSettings.hpp"
 #include "firestarter/X86/Payload/X86Payload.hpp"
 
 namespace firestarter::x86::payload {

diff --git a/include/firestarter/X86/Payload/FMA4Payload.hpp b/include/firestarter/X86/Payload/FMA4Payload.hpp
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include "firestarter/Payload/PayloadSettings.hpp"
 #include "firestarter/X86/Payload/X86Payload.hpp"
 
 namespace firestarter::x86::payload {

diff --git a/include/firestarter/X86/Payload/FMAPayload.hpp b/include/firestarter/X86/Payload/FMAPayload.hpp
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include "firestarter/Payload/PayloadSettings.hpp"
 #include "firestarter/X86/Payload/X86Payload.hpp"
 
 namespace firestarter::x86::payload {

diff --git a/include/firestarter/X86/Payload/SSE2Payload.hpp b/include/firestarter/X86/Payload/SSE2Payload.hpp
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include "firestarter/Payload/PayloadSettings.hpp"
 #include "firestarter/X86/Payload/X86Payload.hpp"
 
 namespace firestarter::x86::payload {

diff --git a/include/firestarter/X86/Payload/X86Payload.hpp b/include/firestarter/X86/Payload/X86Payload.hpp
@@ -21,10 +21,10 @@
 
 #pragma once
 
-#include "firestarter/Constants.hpp"          // IWYU pragma: keep
+#include "firestarter/Constants.hpp"
 #include "firestarter/DumpRegisterStruct.hpp" // IWYU pragma: keep
 #include "firestarter/LoadWorkerMemory.hpp"
-#include "firestarter/Logging/Log.hpp" // IWYU pragma: keep
+#include "firestarter/Logging/Log.hpp"
 #include "firestarter/Payload/Payload.hpp"
 #include "firestarter/X86/X86CpuFeatures.hpp"
 
@@ -87,9 +87,8 @@ class X86Payload : public firestarter::payload::Payload {
   /// \arg Builder The builder that contains the assembler code.
   static void printAssembler(asmjit::BaseBuilder& Builder) {
     asmjit::String Sb;
-    asmjit::FormatOptions FormatOptions{};
 
-    asmjit::Formatter::formatNodeList(Sb, FormatOptions, &Builder);
+    asmjit::Formatter::formatNodeList(Sb, asmjit::FormatOptions{}, &Builder);
     log::info() << Sb.data();
   }
 

diff --git a/include/firestarter/X86/Payload/ZENFMAPayload.hpp b/include/firestarter/X86/Payload/ZENFMAPayload.hpp
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "asmjit/core/cpuinfo.h"
+#include "firestarter/Payload/PayloadSettings.hpp"
 #include "firestarter/X86/Payload/X86Payload.hpp"
 
 namespace firestarter::x86::payload {

diff --git a/src/firestarter/CPUTopology.cpp b/src/firestarter/CPUTopology.cpp
@@ -22,7 +22,11 @@
 #include "firestarter/CPUTopology.hpp"
 #include "firestarter/Logging/Log.hpp"
 
+#include <algorithm>
 #include <array>
+#include <optional>
+#include <sstream>
+#include <vector>
 
 #if defined(__APPLE__)
 #include <mach/thread_act.h>

diff --git a/src/firestarter/Config/Config.cpp b/src/firestarter/Config/Config.cpp
@@ -21,10 +21,20 @@
 
 #include "firestarter/Config/Config.hpp"
 #include "firestarter/Config/CpuBind.hpp"
+#include "firestarter/Config/InstructionGroups.hpp"
 #include "firestarter/Constants.hpp"
 #include "firestarter/Logging/Log.hpp"
+#include "firestarter/SafeExit.hpp"
 
+#include <algorithm>
+#include <cstdlib>
 #include <cxxopts.hpp>
+#include <exception>
+#include <nitro/log/severity.hpp>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace {
 

diff --git a/src/firestarter/Config/CpuBind.cpp b/src/firestarter/Config/CpuBind.cpp
@@ -21,8 +21,12 @@
 
 #include "firestarter/Config/CpuBind.hpp"
 
+#include <cstdint>
 #include <regex>
+#include <set>
 #include <sstream>
+#include <stdexcept>
+#include <string>
 
 namespace firestarter {
 

diff --git a/src/firestarter/Config/InstructionGroups.cpp b/src/firestarter/Config/InstructionGroups.cpp
@@ -22,7 +22,13 @@
 #include "firestarter/Config/InstructionGroups.hpp"
 
 #include <cassert>
+#include <cstring>
 #include <regex>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace firestarter {
 

diff --git a/src/firestarter/DumpRegisterWorker.cpp b/src/firestarter/DumpRegisterWorker.cpp
@@ -19,11 +19,22 @@
  * Contact: [email protected]
  *****************************************************************************/
 
+#include "firestarter/Constants.hpp"
+#include "firestarter/DumpRegisterStruct.hpp"
+#include "firestarter/DumpRegisterWorkerData.hpp"
 #include "firestarter/Firestarter.hpp"
 
+#include <chrono>
+#include <cstdint>
+#include <cstring>
 #include <fstream>
+#include <memory>
+#include <ostream>
 #include <sstream>
+#include <string>
 #include <thread>
+#include <utility>
+#include <vector>
 
 namespace {
 auto hammingDistance(uint64_t X, uint64_t Y) -> unsigned {
@@ -66,6 +77,7 @@ void Firestarter::joinDumpRegisterWorker() { this->DumpRegisterWorkerThread.join
 
 void Firestarter::dumpRegisterWorker(std::unique_ptr<DumpRegisterWorkerData> Data) {
 #if defined(linux) || defined(__linux__)
+  // NOLINTNEXTLINE(misc-include-cleaner)
   pthread_setname_np(pthread_self(), "DumpRegWorker");
 #endif
 

diff --git a/src/firestarter/Firestarter.cpp b/src/firestarter/Firestarter.cpp
@@ -20,18 +20,37 @@
  *****************************************************************************/
 
 #include "firestarter/Firestarter.hpp"
+#include "firestarter/Config/Config.hpp"
+#include "firestarter/Config/InstructionGroups.hpp"
+#include "firestarter/Constants.hpp"
+#include "firestarter/Cuda/Cuda.hpp"
+#include "firestarter/FunctionSelection.hpp"
 #include "firestarter/Logging/Log.hpp"
+#include "firestarter/Measurement/MeasurementWorker.hpp"
 #include "firestarter/Measurement/Metric/IPCEstimate.hpp"
+#include "firestarter/OneAPI/OneAPI.hpp"
 #include "firestarter/Optimizer/Algorithm/NSGA2.hpp"
 #include "firestarter/Optimizer/History.hpp"
+#include "firestarter/Optimizer/Population.hpp"
 #include "firestarter/Optimizer/Problem/CLIArgumentProblem.hpp"
+#include "firestarter/SafeExit.hpp"
+#include "firestarter/ThreadAffinity.hpp"
 #include "firestarter/X86/X86CpuFeatures.hpp"
 #include "firestarter/X86/X86FunctionSelection.hpp"
 #include "firestarter/X86/X86ProcessorInformation.hpp"
 
+#include <algorithm>
+#include <chrono>
 #include <csignal>
+#include <cstdint>
 #include <cstdlib>
+#include <iomanip>
+#include <limits>
 #include <memory>
+#include <mutex>
+#include <stdexcept>
+#include <string>
+#include <utility>
 
 namespace firestarter {
 
@@ -187,6 +206,7 @@ Firestarter::Firestarter(Config&& ProvidedConfig)
 
   // add some signal handler for aborting FIRESTARTER
   if constexpr (!firestarter::OptionalFeatures.IsWin32) {
+    // NOLINTNEXTLINE(misc-include-cleaner)
     (void)std::signal(SIGALRM, Firestarter::sigalrmHandler);
   }
 

diff --git a/src/firestarter/FunctionSelection.cpp b/src/firestarter/FunctionSelection.cpp
@@ -20,20 +20,29 @@
  *****************************************************************************/
 
 #include "firestarter/FunctionSelection.hpp"
+#include "firestarter/CPUTopology.hpp"
+#include "firestarter/CpuFeatures.hpp"
+#include "firestarter/CpuModel.hpp"
 #include "firestarter/Logging/Log.hpp"
+#include "firestarter/Platform/PlatformConfig.hpp"
 #include "firestarter/Platform/PlatformConfigAndThreads.hpp"
+#include "firestarter/ProcessorInformation.hpp"
 
 #include <algorithm>
 #include <cstdio>
 #include <iomanip>
+#include <ios>
+#include <memory>
+#include <optional>
+#include <stdexcept>
+#include <string>
 
 namespace firestarter {
 
 auto FunctionSelection::selectAvailableFunction(
     unsigned FunctionId, const CpuFeatures& Features, std::optional<unsigned> InstructionCacheSize,
     bool AllowUnavailablePayload) const -> std::unique_ptr<platform::PlatformConfig> {
   unsigned Id = 1;
-  std::optional<std::string> DefaultPayloadName;
 
   for (const auto& Platform : platform::PlatformConfigAndThreads::fromPlatformConfigs(platformConfigs())) {
     // the selected function

diff --git a/src/firestarter/LoadWorker.cpp b/src/firestarter/LoadWorker.cpp
@@ -21,10 +21,14 @@
 
 #include "firestarter/AlignedAlloc.hpp"
 #include "firestarter/Constants.hpp"
+#include "firestarter/DumpRegisterStruct.hpp"
 #include "firestarter/ErrorDetectionStruct.hpp"
 #include "firestarter/Firestarter.hpp"
 #include "firestarter/LoadWorkerData.hpp"
+#include "firestarter/LoadWorkerMemory.hpp"
+#include "firestarter/Logging/FirstWorkerThreadFilter.hpp"
 #include "firestarter/Logging/Log.hpp"
+#include "firestarter/ThreadAffinity.hpp"
 
 #if defined(linux) || defined(__linux__)
 #include "firestarter/Measurement/Metric/IPCEstimate.hpp"
@@ -37,13 +41,23 @@
 #include <SCOREP_User.h>
 #endif
 
+#include <algorithm>
+#include <cassert>
+#include <chrono>
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
+#include <cstring>
+#include <functional>
 #include <iomanip>
+#include <ios>
 #include <limits>
+#include <memory>
 #include <sstream>
+#include <string>
 #include <thread>
+#include <utility>
+#include <vector>
 
 namespace firestarter {
 
@@ -276,6 +290,7 @@ void Firestarter::loadThreadWorker(const std::shared_ptr<LoadWorkerData>& Td) {
   auto OldState = LoadThreadState::ThreadWait;
 
 #if defined(linux) || defined(__linux__)
+  // NOLINTNEXTLINE(misc-include-cleaner)
   pthread_setname_np(pthread_self(), "LoadWorker");
 #endif
 

diff --git a/src/firestarter/Main.cpp b/src/firestarter/Main.cpp
@@ -19,9 +19,14 @@
  * Contact: [email protected]
  *****************************************************************************/
 
+#include "firestarter/Config/Config.hpp"
 #include "firestarter/Firestarter.hpp"
 #include "firestarter/Logging/Log.hpp"
 
+#include <cstdlib>
+#include <exception>
+#include <utility>
+
 auto main(int argc, const char** argv) -> int {
   firestarter::log::info() << "FIRESTARTER - A Processor Stress Test Utility, Version " << _FIRESTARTER_VERSION_STRING
                            << "\n"