import-trace: --memory-type filter to focus on a specific memory type

Author: stettberger

tools/import-trace/Importer.hpp

@@ -30,6 +30,7 @@ class Importer : public fail::AliasedRegisterable {
 	fail::Database *db;
 	fail::Architecture m_arch;
 	fail::UniformRegisterSet *m_extended_trace_regs;
+	fail::memory_type_t m_memtype;
 
 	/* How many rows were inserted into the database */
 	unsigned m_row_count;
@@ -121,8 +122,8 @@ class Importer : public fail::AliasedRegisterable {
 public:
 	Importer() : m_variant_id(0), m_elf(NULL), m_mm(NULL), m_faultspace_rightmargin('W'),
 		m_sanitychecks(false), m_import_write_ecs(true), m_extended_trace(false), db(NULL),
-		m_extended_trace_regs(NULL), m_row_count(0), m_time_trace_start(0),
-		m_last_ip(0), m_last_instr(0), m_last_time(0) {}
+		m_extended_trace_regs(NULL), m_memtype(fail::ANY_MEMORY), m_row_count(0),
+		m_time_trace_start(0), m_last_ip(0), m_last_instr(0), m_last_time(0) {}
 	bool init(const std::string &variant, const std::string &benchmark, fail::Database *db);
 
 	/**
@@ -142,6 +143,7 @@ class Importer : public fail::AliasedRegisterable {
 	void set_sanitychecks(bool enabled) { m_sanitychecks = enabled; }
 	void set_import_write_ecs(bool enabled) { m_import_write_ecs = enabled; }
 	void set_extended_trace(bool enabled) { m_extended_trace = enabled; }
+	void set_memory_type(fail::memory_type_t type) { m_memtype = type; }
 };
 
 #endif

tools/import-trace/MemoryImporter.cc

@@ -11,6 +11,11 @@ bool MemoryImporter::handle_ip_event(simtime_t curtime, instruction_count_t inst
 
 bool MemoryImporter::handle_mem_event(simtime_t curtime, instruction_count_t instr,
 									  Trace_Event &ev) {
+	// Filter out memory events of wrong memory type
+	memory_type_t mtype = static_cast<memory_type_t>(ev.memtype());
+	if(mtype != m_memtype && m_memtype != ANY_MEMORY)
+		return true;
+
 	address_t from = ev.memaddr(), to = ev.memaddr() + ev.width();
 	// Iterate over all accessed bytes
 	// FIXME Keep complete trace information (access width)?

tools/import-trace/main.cc

@@ -129,6 +129,10 @@ int main(int argc, char *argv[]) {
 		cmd.addOption("", "extended-trace", Arg::None,
 			"--extended-trace \tImport extended trace information if available");
 
+    CommandLine::option_handle MEMORY_TYPE =
+        cmd.addOption("", "memory-type", Arg::Required,
+            "--memory-type\t Only import memory access trace events with the specified type. (default: any)");
+
 	// variant 1: care (synthetic Rs)
 	// variant 2: don't care (synthetic Ws)
 	CommandLine::option_handle FAULTSPACE_RIGHTMARGIN =
@@ -235,6 +239,26 @@ int main(int argc, char *argv[]) {
 	}
 	importer->set_memorymap(memorymap);
 
+	if (cmd[MEMORY_TYPE]) {
+		std::string arg(cmd[MEMORY_TYPE].first()->arg);
+		memory_type_t type;
+		if (arg == "ram")
+			type = MEMTYPE_RAM;
+		else if (arg == "flash")
+			type = MEMTYPE_FLASH;
+		else if (arg == "tags")
+			type = MEMTYPE_TAGS;
+		else if (arg == "eeprom")
+			type = MEMTYPE_EEPROM;
+		else if (arg == "any")
+			type = ANY_MEMORY;
+		else {
+			LOG << "ERROR: unknown memory type: " << arg << std::endl;
+			exit(-1);
+		}
+		importer->set_memory_type(type);
+	}
+
 	if (cmd[FAULTSPACE_RIGHTMARGIN]) {
 		std::string rightmargin(cmd[FAULTSPACE_RIGHTMARGIN].first()->arg);
 		if (rightmargin == "W") {