Merge branch 'feat/90' into 'devel'

[PGIS] Towards better option handling (#90) See merge request tuda-sc/projects/metacg!120
tudasc · Aug 14, 2023 · 3cb8d31 · 3cb8d31
2 parents de00a32 + 79b7852
commit 3cb8d31
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 103 deletions.
diff --git a/pgis/lib/include/ErrorCodes.h b/pgis/lib/include/ErrorCodes.h
@@ -18,7 +18,8 @@ enum ErrorCode : int {
   UnknownFileFormat,
   ErroneousOverheadConfiguration,
   CouldNotGetCWD,
-  TooFewProgramArguments = 1024,
+  FileDoesNotExist,
+  TooFewProgramArguments = 1024
 };
 }  // namespace pgis
 

diff --git a/pgis/lib/include/ExtrapConnection.h b/pgis/lib/include/ExtrapConnection.h
@@ -24,6 +24,7 @@
 
 #include "cxxabi.h"
 
+#include <filesystem>
 #include <map>
 #include <numeric>
 #include <string>
@@ -87,11 +88,11 @@ class ExtrapExtrapolator {
 };
 
 /* Utility functions to read in configuration and print it */
-ExtrapConfig getExtrapConfigFromJSON(std::string filePath);
+ExtrapConfig getExtrapConfigFromJSON(const std::filesystem::path &filePath);
 
 void printConfig(ExtrapConfig &cfg);
 
-inline std::string demangle(std::string &input) {
+inline std::string demangle(std::string input) {
   char *res;
   int st;
   res = abi::__cxa_demangle(input.c_str(), nullptr, nullptr, &st);
@@ -193,7 +194,7 @@ class ExtrapModelProvider {
     }
   }
   // Needs to be defined in header, so deduction works correctly in usages.
-  auto getModelFor(std::string functionName) {
+  auto getModelFor(const std::string &functionName) {
     if (models.empty()) {
       buildModels();
     }
@@ -213,7 +214,7 @@ class ExtrapModelProvider {
 
   std::vector<EXTRAP::Parameter> getParameterList();
 
-  std::vector<double> getConfigValues(std::string key) {
+  std::vector<double> getConfigValues(const std::string &key) {
     std::vector<double> vals;
     vals.reserve(config.params.size());
     // FIXME for now we assume only a single parameter!!

diff --git a/pgis/lib/include/MetaData/CgNodeMetaData.h b/pgis/lib/include/MetaData/CgNodeMetaData.h
@@ -223,7 +223,7 @@ class PiraTwoData : public metacg::MetaData::Registrar<PiraTwoData> {
     auto &gOpts = ::pgis::config::GlobalConfig::get();
     auto rtOnly = gOpts.getAs<bool>("runtime-only");
 
-    auto rtAndParams = valTup(getRuntimeVec(), getExtrapParameters(), getNumReps());
+    auto rtAndParams = utils::valTup(getRuntimeVec(), getExtrapParameters(), getNumReps());
     nlohmann::json experiments;
     for (auto elem : rtAndParams) {
       nlohmann::json exp{};

diff --git a/pgis/lib/include/Utility.h b/pgis/lib/include/Utility.h
@@ -19,7 +19,15 @@
 #include <string>
 #include <unistd.h>
 
-namespace {
+namespace utils {
+namespace string {
+
+inline bool stringEndsWith(const std::string &s, const std::string &suffix) {
+  return s.size() >= suffix.size() && s.compare(s.size() - suffix.size(), suffix.size(), suffix) == 0;
+}
+
+}  // namespace string
+
 inline std::string getHostname() {
   char *cName = (char *)malloc(255 * sizeof(char));
   if (!gethostname(cName, 255)) {
@@ -63,7 +71,7 @@ auto valTup(C1 co, C2 ct, int numReps) {
   return res;
 }
 
-}  // namespace
+}  // namespace utils
 
 inline bool isEligibleForPathInstrumentation(metacg::CgNode *node, metacg::Callgraph *graph,
                                              std::vector<metacg::CgNode *> parents = {}) {

diff --git a/pgis/lib/src/ExtrapConnection.cpp b/pgis/lib/src/ExtrapConnection.cpp
@@ -41,7 +41,7 @@ void printConfig(ExtrapConfig &cfg) {
       cfg.directory, cfg.repetitions, cfg.prefix, cfg.postfix, cfg.iteration, parameterStr);
 }
 
-ExtrapConfig getExtrapConfigFromJSON(std::string filePath) {
+ExtrapConfig getExtrapConfigFromJSON(const std::filesystem::path &filePath) {
   using json = nlohmann::json;
 
   json j;