Made plugin call configurable

2018-04-24 19:05:01 +02:00 · 2018-04-24 19:05:01 +02:00 · 1102449d38
commit 1102449d38
parent 292e2dbb89
8 changed files with 1821 additions and 26 deletions
--- a/cycles.txt
+++ b/cycles.txt
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 555bff0a20cfbf775994ed74b188b9af480df883
+Subproject commit 393c374cac4950e629036dda1615abedf866961f
--- a/plugin.launch
+++ b/plugin.launch
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.cdt.launch.applicationLaunchType">
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB" value="true"/>
+<listAttribute key="org.eclipse.cdt.dsf.gdb.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_ON_FORK" value="false"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.GDB_INIT" value=".gdbinit"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE" value="false"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.REVERSE_MODE" value="UseSoftTrace"/>
+<listAttribute key="org.eclipse.cdt.dsf.gdb.SOLIB_PATH"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-v4&#10;-p ic=${workspace_loc:DBT-RISE-RISCV}/cycles.txt&#10;${project_loc:hello}/hello"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/Debug/riscv/bin/riscv"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="DBT-RISE-RISCV"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.config.gnu.exe.debug.1751741082"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/DBT-RISE-RISCV"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
--- a/dhrystone.launch
+++ b/dhrystone.launch
@ -12,7 +12,7 @@
 <stringAttribute key="org.eclipse.cdt.dsf.gdb.TRACEPOINT_MODE" value="TP_NORMAL_ONLY"/>
 <booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
 <booleanAttribute key="org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab.DEFAULTS_SET" value="true"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="1"/>
 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="gdb"/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
@ -22,7 +22,7 @@
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/Release/riscv/bin/riscv"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="DBT-RISE-RISCV"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="cdt.managedbuild.config.gnu.exe.release.1745230171"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/DBT-RISE-RISCV"/>
 </listAttribute>
--- a/riscv/incl/iss/arch/riscv_hart_msu_vp.h
+++ b/riscv/incl/iss/arch/riscv_hart_msu_vp.h
@ -55,7 +55,7 @@ namespace arch {

 enum { tohost_dflt = 0xF0001000, fromhost_dflt = 0xF0001040 };

-enum csr_name {
+enum riscv_csr {
    /* user-level CSR */
    // User Trap Setup
    ustatus = 0x000,
--- a/riscv/src/main.cpp
+++ b/riscv/src/main.cpp
@ -66,7 +66,8 @@ int main(int argc, char *argv[]) {
        ("dump-ir", "dump the intermediate representation")
        ("elf", po::value<std::vector<std::string>>(), "ELF file(s) to load")
        ("mem,m", po::value<std::string>(), "the memory input file")
-        ("isa", po::value<std::string>()->default_value("rv32imac"), "isa to use for simulation");
+        ("plugin,p", po::value<std::vector<std::string>>(), "plugin to activate")
+        ("isa", po::value<std::string>()->default_value("rv32gc"), "isa to use for simulation");
    // clang-format on
    auto parsed = po::command_line_parser(argc, argv).options(desc).allow_unregistered().run();
    try {
@ -97,30 +98,55 @@ int main(int argc, char *argv[]) {
        LOG_OUTPUT(connection)::stream() = f;
    }

+    std::vector<iss::vm_plugin*> plugin_list;
+    auto res=0;
    try {
        // application code comes here //
        iss::init_jit(argc, argv);
        bool dump = clim.count("dump-ir");
        // instantiate the simulator
        std::unique_ptr<iss::vm_if> vm{nullptr};
+        std::unique_ptr<iss::arch_if> cpu{nullptr};
        std::string isa_opt(clim["isa"].as<std::string>());
-//        iss::plugin::instruction_count ic_plugin("riscv/gen_input/src-gen/rv32imac_cyles.txt");
-//        iss::plugin::cycle_estimate ce_plugin("riscv/gen_input/src-gen/rv32imac_cyles.txt");
-        if (isa_opt.substr(0, 4)=="rv64") {
-            iss::arch::rv64ia* cpu = new iss::arch::riscv_hart_msu_vp<iss::arch::rv64ia>();
-            vm = iss::create(cpu, clim["gdb-port"].as<unsigned>());
-        } else if (isa_opt.substr(0, 5)=="rv32i") {
-            iss::arch::rv32imac* cpu = new iss::arch::riscv_hart_msu_vp<iss::arch::rv32imac>();
-            vm = iss::create(cpu, clim["gdb-port"].as<unsigned>());
-            //vm->register_plugin(ce_plugin);
-        } else if (isa_opt.substr(0, 5)=="rv32g") {
-            iss::arch::rv32gc* cpu = new iss::arch::riscv_hart_msu_vp<iss::arch::rv32gc>();
-            vm = iss::create(cpu, clim["gdb-port"].as<unsigned>());
-            //vm->register_plugin(ce_plugin);
+        if (isa_opt=="rv64ia") {
+            iss::arch::rv64ia* lcpu = new iss::arch::riscv_hart_msu_vp<iss::arch::rv64ia>();
+            vm = iss::create(lcpu, clim["gdb-port"].as<unsigned>());
+            cpu.reset(lcpu);
+        } else if (isa_opt=="rv32imac") {
+            iss::arch::rv32imac* lcpu = new iss::arch::riscv_hart_msu_vp<iss::arch::rv32imac>();
+            vm = iss::create(lcpu, clim["gdb-port"].as<unsigned>());
+            cpu.reset(lcpu);
+        } else if (isa_opt=="rv32gc") {
+            iss::arch::rv32gc* lcpu = new iss::arch::riscv_hart_msu_vp<iss::arch::rv32gc>();
+            vm = iss::create(lcpu, clim["gdb-port"].as<unsigned>());
+            cpu.reset(lcpu);
        } else {
            LOG(ERROR) << "Illegal argument value for '--isa': " << clim["isa"].as<std::string>() << std::endl;
            return 127;
        }
+        if (clim.count("plugin")) {
+           for (std::string opt_val : clim["plugin"].as<std::vector<std::string>>()){
+               auto plugin_name{opt_val};
+               std::string filename{"cycles.txt"};
+               std::size_t found = opt_val.find('=');
+               if (found!=std::string::npos){
+                   plugin_name=opt_val.substr(0, found);
+                   filename=opt_val.substr(found+1, opt_val.size());
+               }
+                if(plugin_name=="ic"){
+                    auto* ic_plugin= new iss::plugin::instruction_count(filename);
+                    vm->register_plugin(*ic_plugin);
+                    plugin_list.push_back(ic_plugin);
+                } else if(plugin_name=="ce"){
+                    auto* ce_plugin= new iss::plugin::cycle_estimate(filename);
+                    vm->register_plugin(*ce_plugin);
+                    plugin_list.push_back(ce_plugin);
+                } else {
+                    LOG(ERROR) << "Unknown plugin name: " << plugin_name << ", valid names are 'ce', 'ic'"<<std::endl;
+                    return 127;
+                }
+            }
+        }
        if (clim.count("disass")) {
            vm->setDisassEnabled(true);
            LOGGER(disass)::reporting_level() = logging::INFO;
@ -151,9 +177,14 @@ int main(int argc, char *argv[]) {
        }
 		vm->reset(start_address);
        auto cycles = clim["instructions"].as<int64_t>();
-        return vm->start(cycles, dump);
+        res = vm->start(cycles, dump);
    } catch (std::exception &e) {
        LOG(ERROR) << "Unhandled Exception reached the top of main: " << e.what() << ", application will now exit" << std::endl;
-        return 2;
+        res=2;
    }
+    // cleanup to let plugins report of needed
+    for(auto* p:plugin_list){
+        delete p;
+    }
+    return res;
 }
--- a/riscv/src/plugin/cycle_estimate.cpp
+++ b/riscv/src/plugin/cycle_estimate.cpp
@ -63,7 +63,7 @@ bool iss::plugin::cycle_estimate::registration(const char* const version, vm_if&
 	if(!arch_instr) return false;
 	const std::string  core_name = arch_instr->core_type_name();
    Json::Value &val = root[core_name];
-    if(val.isArray()){
+    if(!val.isNull() && val.isArray()){
    	delays.reserve(val.size());
    	for(auto it:val){
    		auto name = it["name"];
@ -76,6 +76,8 @@ bool iss::plugin::cycle_estimate::registration(const char* const version, vm_if&
 				delays.push_back(instr_desc{size.asUInt(), delay[0].asUInt(), delay[1].asUInt()});
    		}
    	}
+    } else {
+        LOG(ERROR)<<"plugin cycle_estimate: could not find an entry for "<<core_name<<" in JSON file"<<std::endl;
    }
 	return true;

@ -85,8 +87,6 @@ void iss::plugin::cycle_estimate::callback(instr_info_t instr_info) {
    assert(arch_instr && "No instrumentation interface available but callback executed");
 	auto entry = delays[instr_info.instr_id];
 	bool taken = (arch_instr->get_next_pc()-arch_instr->get_pc()) != (entry.size/8);
-	if(taken && entry.taken > 1 ) // 1 is the default increment per instruction
-		arch_instr->set_curr_instr_cycles(entry.taken);
-	if(!taken && entry.not_taken > 1) // 1 is the default increment per instruction
-		arch_instr->set_curr_instr_cycles(entry.not_taken);
+    uint32_t delay = taken ? entry.taken : entry.not_taken;
+    if(delay>1) arch_instr->set_curr_instr_cycles(delay);
 }
--- a/riscv/src/plugin/instruction_count.cpp
+++ b/riscv/src/plugin/instruction_count.cpp
@ -68,7 +68,7 @@ bool iss::plugin::instruction_count::registration(const char* const version, vm_
    if(!instr_if) return false;
 	const std::string  core_name = instr_if->core_type_name();
    Json::Value &val = root[core_name];
-    if(val.isArray()){
+    if(!val.isNull() && val.isArray()){
    	delays.reserve(val.size());
    	for(auto it:val){
    		auto name = it["name"];
@ -84,6 +84,8 @@ bool iss::plugin::instruction_count::registration(const char* const version, vm_
    		}
    	}
    	rep_counts.resize(delays.size());
+    } else {
+        LOG(ERROR)<<"plugin instruction_count: could not find an entry for "<<core_name<<" in JSON file"<<std::endl;
    }
 	return true;
 }