clang format

Author: janniclas

.docker/Dockerfile.devenv

@@ -16,4 +16,5 @@ USER vscode
 
 ENV CC "/usr/bin/clang-14"
 ENV CXX "/usr/bin/clang++-14"
+ENV PATH "/usr/local/llvm-14/bin:/home/vscode/.local/bin:$PATH"
 ENV CMAKE_GENERATOR "Ninja"

include/phasar/Controller/AnalysisController.h

@@ -49,7 +49,7 @@ enum class AnalysisControllerEmitterOptions : uint32_t {
   EmitPTAAsText = (1 << 11),
   EmitPTAAsDot = (1 << 12),
   EmitPTAAsJson = (1 << 13),
-  EmitStatisticAsJson = (1 << 14),
+  EmitStatisticsAsJson = (1 << 14),
 };
 
 class AnalysisController {

include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h

@@ -48,6 +48,7 @@ class GeneralStatistics {
   std::set<const llvm::Type *> AllocatedTypes;
   std::set<const llvm::Instruction *> AllocaInstructions;
   std::set<const llvm::Instruction *> RetResInstructions;
+  std::string ModuleName = "";
 
 public:
   /**

lib/Controller/AnalysisController.cpp

@@ -273,9 +273,9 @@ void AnalysisController::emitRequestedHelperAnalysisResults() {
     }
   }
 
-  if (EmitterOptions & AnalysisControllerEmitterOptions::EmitStatisticAsJson) {
+  if (EmitterOptions & AnalysisControllerEmitterOptions::EmitStatisticsAsJson) {
     if (!ResultDirectory.empty()) {
-      if (auto OFS = openFileStream("/psr-IrStatistic.json")) {
+      if (auto OFS = openFileStream("/psr-IrStatistics.json")) {
         IRDB.printAsJson(*OFS);
       }
     } else {

lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp

@@ -43,6 +43,7 @@ GeneralStatisticsAnalysis::run(llvm::Module &M,
   static const std::set<std::string> MemAllocatingFunctions = {
       "operator new(unsigned long)", "operator new[](unsigned long)", "malloc",
       "calloc", "realloc"};
+  Stats.ModuleName = M.getName();
   for (auto &F : M) {
     ++Stats.Functions;
     for (auto &BB : F) {
@@ -218,11 +219,12 @@ GeneralStatistics::getRetResInstructions() const {
 
 nlohmann::json GeneralStatistics::getAsJson() const {
   nlohmann::json J;
+  J["ModuleName"] = GeneralStatistics::ModuleName;
   J["Instructions"] = getInstructions();
   J["Functions"] = Functions;
-  J["Alloca Instructions"] = AllocaInstructions.size();
-  J["Call Sites"] = CallSites;
-  J["Global Variables"] = Globals;
+  J["AllocaInstructions"] = AllocaInstructions.size();
+  J["CallSites"] = CallSites;
+  J["GlobalVariables"] = Globals;
   return J;
 }
 

tools/phasar-llvm/phasar-llvm.cpp

@@ -408,7 +408,7 @@ int main(int Argc, const char **Argv) {
     EmitterOptions |= AnalysisControllerEmitterOptions::EmitPTAAsJson;
   }
   if (PhasarConfig::VariablesMap().count("emit-statistic-as-json")) {
-    EmitterOptions |= AnalysisControllerEmitterOptions::EmitStatisticAsJson;
+    EmitterOptions |= AnalysisControllerEmitterOptions::EmitStatisticsAsJson;
   }
   if (PhasarConfig::VariablesMap().count("follow-return-past-seeds")) {
     SolverConfig.setFollowReturnsPastSeeds(