Merge branch 'power' into 'master'

Power

See merge request gwt_sdk_developer/gvsoc!21

engine/CMakeLists.txt

@@ -12,7 +12,10 @@ set(GVSOC_ENGINE_CXX_SRCS
     "src/clock/clock.cpp"
     "src/vp.cpp"
     "src/proxy.cpp"
-    "src/power/power.cpp"
+    "src/power/power_engine.cpp"
+    "src/power/component_power.cpp"
+    "src/power/power_trace.cpp"
+    "src/power/power_source.cpp"
     "src/launcher.cpp"
     )
 

engine/include/vp/component.hpp

@@ -35,7 +35,7 @@
 #include "vp/itf/clk.hpp"
 #include "vp/clock/component_clock.hpp"
 #include "vp/trace/component_trace.hpp"
-#include "vp/power/component_power.hpp"
+#include "gv/power.hpp"
 #include "json.hpp"
 #include <functional>
 
@@ -424,7 +424,7 @@ namespace vp {
 
     void dump_traces_recursive(FILE *file);
 
-
+    component *get_parent() { return this->parent; }
     inline js::config *get_js_config() { return comp_js_config; }
 
     js::config *get_vp_config();
@@ -457,6 +457,7 @@ namespace vp {
     config *import_config(const char *config_string);
 
     void reg_step_pre_start(std::function<void()> callback);
+    void register_build_callback(std::function<void()> callback);
 
     void post_post_build();
 
@@ -525,7 +526,7 @@ namespace vp {
     virtual std::string handle_command(Gv_proxy *proxy, FILE *req_file, FILE *reply_file, std::vector<std::string> args, std::string req) { return ""; }
 
     component_trace traces;
-    component_power power;
+    vp::power::component_power power;
 
     trace warning;
 
@@ -557,6 +558,7 @@ namespace vp {
     component *parent = NULL;
 
     vector<std::function<void()>> pre_start_callbacks;
+    vector<std::function<void()>> build_callbacks;
     vector<vp::reg *> regs;
 
     bool reset_done_from_itf;

engine/include/vp/power/power_engine.hpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-/* 
+/*
  * Authors: Germain Haugou, GreenWaves Technologies ([email protected])
  */
 
@@ -24,24 +24,35 @@
 
 #include "vp/vp_data.hpp"
 #include "vp/component.hpp"
-#include "vp/power/power.hpp"
+#include "gv/power.hpp"
 #include <pthread.h>
 #include <thread>
 
-namespace vp {
+namespace vp
+{
+
+    namespace power
+    {
+
+        class engine
+        {
+        public:
+            engine(vp::component *top);
+
+            void start_capture();
 
-  class power_engine : public component
-  {
-  public:
-    power_engine(js::config *config);
+            void stop_capture();
 
-    virtual void start_capture() {}
+            void reg_trace(vp::power::power_trace *trace);
 
-    virtual void stop_capture() {}
+        private:
+            std::vector<vp::power::power_trace *> traces;
 
-    virtual void reg_trace(vp::power_trace *trace) {}
-  };
+            vp::component *time_engine;
 
+            vp::component *top;
+        };
+    };
 };
 
 #endif

engine/include/vp/power/power_source.hpp

@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 GreenWaves Technologies, SAS, ETH Zurich and
+ *                    University of Bologna
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Authors: Germain Haugou, GreenWaves Technologies ([email protected])
+ */
+
+
+#pragma once
+
+#include "vp/vp_data.hpp"
+#include "vp/power/power_engine.hpp"
+
+
+inline void vp::power::power_source::leakage_power_start()
+{
+    if (!this->is_on && this->leakage != -1)
+    {
+        this->trace->inc_leakage_power(this->leakage);
+    }
+    this->is_on = true;
+}
+
+inline void vp::power::power_source::leakage_power_stop()
+{
+    if (this->is_on && this->leakage != -1)
+    {
+        this->trace->inc_leakage_power(-this->leakage);
+    }
+    this->is_on = false;
+}
+
+inline void vp::power::power_source::dynamic_power_start()
+{
+    if (!this->is_on && this->background_power != -1)
+    {
+        this->trace->inc_dynamic_power(this->background_power);
+    }
+    this->is_on = true;
+}
+
+inline void vp::power::power_source::dynamic_power_stop()
+{
+    if (this->is_on && this->background_power != -1)
+    {
+        this->trace->inc_dynamic_power(-this->background_power);
+    }
+    this->is_on = false;
+}
+
+inline void vp::power::power_source::account_energy_quantum()
+{
+    if (this->quantum != -1)
+    {
+        this->trace->inc_dynamic_energy(this->quantum);
+    }
+}