Simulation output path option was added.

ispras · Aug 16, 2024 · 4ebe450 · 4ebe450
1 parent 5aabc77
commit 4ebe450
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -53,7 +53,8 @@ int hlsMain(const HlsContext &context) {
 
 int simMain(const SimContext &context) {
   auto kernel = start();
-  return !kernel->simulate(context.options.dataFiles(), std::cout);
+  return !kernel->simulate(context.options.dataFiles(),
+                           context.options.outFilePath);
 }
 
 int main(int argc, char **argv) {

diff --git a/src/model/dfcxx/include/dfcxx/kernel.h b/src/model/dfcxx/include/dfcxx/kernel.h
@@ -71,7 +71,7 @@ class Kernel {
                const Scheduler &sched);
 
   bool simulate(const std::vector<std::string> &dataPaths,
-                std::ostream &stream);
+                const std::string &outFilePath);
 
 };
 

diff --git a/src/model/dfcxx/includeDev/dfcxx/simulator.h b/src/model/dfcxx/includeDev/dfcxx/simulator.h
@@ -53,7 +53,7 @@ namespace dfcxx {
 
 class DFCXXSimulator {
 public:
-  bool simulate(std::ifstream &in, std::ostream &out, std::vector<Node> nodes);
+  bool simulate(std::ifstream &in, std::ofstream &out, std::vector<Node> nodes);
 };
 
 } // namespace dfcxx

diff --git a/src/model/dfcxx/lib/dfcxx/kernel.cpp b/src/model/dfcxx/lib/dfcxx/kernel.cpp
@@ -83,15 +83,16 @@ bool Kernel::compile(const DFLatencyConfig &config,
 
 
 bool Kernel::simulate(const std::vector<std::string> &dataPaths,
-                      std::ostream &stream) {
+                      const std::string &outFilePath) {
   bool result = true;
   std::vector<Node> sorted = topSort(graph.startNodes,
                                      graph.outputs,
                                      graph.nodes.size());
   DFCXXSimulator sim;
+  std::ofstream out(outFilePath, std::ios::out);
   for (const std::string &path : dataPaths) {
     std::ifstream input(path, std::ios::in);
-    sim.simulate(input, stream, sorted);
+    sim.simulate(input, out, sorted);
   }
 
   return result;

diff --git a/src/model/dfcxx/lib/dfcxx/simulator.cpp b/src/model/dfcxx/lib/dfcxx/simulator.cpp
@@ -5,7 +5,7 @@ namespace dfcxx {
 
 
 bool DFCXXSimulator::simulate(std::ifstream &in,
-                              std::ostream &out,
+                              std::ofstream &out,
                               std::vector<Node> nodes) {
   return true;
 }

diff --git a/src/options.h b/src/options.h
@@ -42,6 +42,7 @@
 #define OUT_FIRRTL_JSON "out_firrtl"
 
 #define SIM_ID_JSON "sim"
+#define SIM_OUT_JSON "out"
 
 //===----------------------------------------------------------------------===//
 // CLI args/flags definitions
@@ -59,6 +60,7 @@
 #define OUT_FIRRTL_ARG CLI_ARG("out-firrtl")
 
 #define SIM_USAGE_FILES_ARG "files"
+#define SIM_OUT_ARG CLI_ARG("out")
 
 //===----------------------------------------------------------------------===//
 
@@ -319,6 +321,11 @@ struct SimOptions final : public AppOptions {
   SimOptions(AppOptions &parent):
       AppOptions(parent, SIM_CMD, "DFCxx simulation") {
     //options->formatter(std::make_shared<UsageFormatter>());
+
+    // Named options.
+    options->add_option(SIM_OUT_ARG,
+                        outFilePath,
+                        "Simulation output path")->expected(1);
     // For processing data files' paths.
     options->allow_extras();
     auto *var = options; // Used for lambda variable passing.
@@ -332,6 +339,12 @@ struct SimOptions final : public AppOptions {
   std::vector<std::string> dataFiles() const {
     return options->remaining();
   }
+
+  void fromJson(Json json) override {
+    get(json, SIM_OUT_JSON, outFilePath);
+  }
+
+  std::string outFilePath;
 };
 
 struct Options final : public AppOptions {