Added cycle estimator and remove deprecated functions

riscv/incl/iss/plugin/cycle_estimate.h

@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (C) 2017, MINRES Technologies GmbH
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors:
+ *       eyck@minres.com - initial API and implementation
+ ******************************************************************************/
+
+#ifndef _ISS_PLUGIN_CYCLE_ESTIMATE_H_
+#define _ISS_PLUGIN_CYCLE_ESTIMATE_H_
+
+#include "iss/vm_plugin.h"
+#include "iss/instrumentation_if.h"
+#include <json/json.h>
+#include <string>
+#include <unordered_map>
+
+namespace iss {
+
+namespace plugin {
+
+class cycle_estimate: public iss::vm_plugin {
+	BEGIN_BF_DECL(instr_desc, uint32_t)
+		BF_FIELD(taken, 24, 8)
+		BF_FIELD(not_taken, 16, 8)
+		BF_FIELD(size, 0, 16)
+		instr_desc(uint32_t size, uint32_t taken, uint32_t not_taken): instr_desc() {
+			this->size=size;
+			this->taken=taken;
+			this->not_taken=not_taken;
+		}
+	END_BF_DECL();
+
+public:
+	cycle_estimate() = delete;
+
+	cycle_estimate(const cycle_estimate& ) = delete;
+
+	cycle_estimate(const cycle_estimate&&) = delete;
+
+	cycle_estimate(std::string config_file_name);
+
+	virtual ~cycle_estimate();
+
+	cycle_estimate& operator=(const cycle_estimate& ) = delete;
+
+	cycle_estimate& operator=(const cycle_estimate&& ) = delete;
+
+	bool registration(const char* const version, vm_if& arch) override;
+
+	sync_type get_sync() override {return POST_SYNC;};
+
+	void callback(instr_info_t instr_info) override;
+private:
+    iss::instrumentation_if* arch_instr;
+    std::vector<instr_desc> delays;
+    struct pair_hash {
+    	size_t operator()(const std::pair<uint64_t, uint64_t>& p) const{
+    		std::hash<uint64_t> hash;
+    		return hash(p.first)+hash(p.second);
+    	}
+    };
+    std::unordered_map<std::pair<uint64_t, uint64_t>, uint64_t, pair_hash> blocks;
+    Json::Value root;
+};
+
+}
+}
+
+#endif /* _ISS_PLUGIN_CYCLE_ESTIMATE_H_ */

riscv/incl/iss/plugin/instruction_count.h

@@ -32,8 +32,8 @@
  *       eyck@minres.com - initial API and implementation
  ******************************************************************************/
 
-#ifndef _ISS_PLUGIN_CYCLE_COUNTER_H_
-#define _ISS_PLUGIN_CYCLE_COUNTER_H_
+#ifndef _ISS_PLUGIN_INSTRUCTION_COUNTER_H_
+#define _ISS_PLUGIN_INSTRUCTION_COUNTER_H_
 
 #include <iss/vm_plugin.h>
 #include <json/json.h>
@@ -52,15 +52,23 @@ class instruction_count: public iss::vm_plugin {
 public:
 	instruction_count() = delete;
 
+	instruction_count(const instruction_count& ) = delete;
+
+	instruction_count(const instruction_count&&) = delete;
+
 	instruction_count(std::string config_file_name);
 
 	virtual ~instruction_count();
 
+	instruction_count& operator=(const instruction_count& ) = delete;
+
+	instruction_count& operator=(const instruction_count&& ) = delete;
+
 	bool registration(const char* const version, vm_if& arch) override;
 
 	sync_type get_sync() override {return POST_SYNC;};
 
-	void callback(unsigned core_id, unsigned cluster_id, sync_type phase, unsigned instr_id) override;
+	void callback(instr_info_t instr_info) override;
 private:
     Json::Value root;
     std::vector<instr_delay> delays;
@@ -70,4 +78,4 @@ private:
 }
 }
 
-#endif /* _ISS_PLUGIN_CYCLE_COUNTER_H_ */
+#endif /* _ISS_PLUGIN_INSTRUCTION_COUNTER_H_ */