Fixing up the last loose ends. :)

Adding verification and bimodal tests.

Author: MatiasBjorling

.cproject

@@ -151,6 +151,12 @@ enum status FtlImpl_Bast::write(Event &event)
  	uint numValid = controller.get_num_valid(&logBlock->address);
 	if (numValid < BLOCK_SIZE)
 	{
+		if (logBlock->pages[eventAddress.page] != -1)
+		{
+			Address replace_address = Address(logBlock->address.get_linear_address()+logBlock->pages[eventAddress.page], PAGE);
+			event.set_replace_address(replace_address);
+		}
+
 		logBlock->pages[eventAddress.page] = numValid;
 
 		Address logBlockAddress = logBlock->address;
@@ -163,15 +169,22 @@ enum status FtlImpl_Bast::write(Event &event)
 
 		allocate_new_logblock(logBlock, lba, event);
 		logBlock = log_map[lba];
-		//printf("Using new log block with address: %lu Block: %u\n", logBlock->address.get_linear_address(), logBlock->address.block);
 		// Write the current io to a new block.
 		logBlock->pages[eventAddress.page] = 0;
 		Address dataPage = logBlock->address;
 		dataPage.valid = PAGE;
 		event.set_address(dataPage);
+
 	}
 
-	Block_manager::instance()->insert_events(event);
+	if (data_list[lba] != -1)
+	{
+
+		int offset = event.get_logical_address() % BLOCK_SIZE;
+		Address replace = new Address(data_list[lba]+offset, PAGE);
+		if (controller.get_block_pointer(replace)->get_state(offset) != EMPTY)
+			event.set_replace_address(replace);
+	}
 
 	// Statistics
 	controller.stats.numFTLWrite++;
@@ -226,8 +239,6 @@ enum status FtlImpl_Bast::trim(Event &event)
 	event.set_address(returnAddress);
 	event.set_noop(true);
 
-	Block_manager::instance()->insert_events(event);
-
 	// Statistics
 	controller.stats.numFTLTrim++;
 
@@ -239,7 +250,6 @@ void FtlImpl_Bast::allocate_new_logblock(LogPageBlock *logBlock, long lba, Event
 {
 	if (log_map.size() >= BAST_LOG_PAGE_LIMIT)
 	{
-		srandom(10);
 		int victim = random()%log_map.size()-1;
 		std::map<long, LogPageBlock*>::iterator it = log_map.begin();
 
@@ -319,28 +329,34 @@ bool FtlImpl_Bast::random_merge(LogPageBlock *logBlock, long lba, Event &event)
 	Address eventAddress = Address(event.get_logical_address(), PAGE);
 	Address newDataBlock = Block_manager::instance()->get_free_block(DATA, event);
 
+	Block *b1 = controller.get_block_pointer(logBlock->address);
+
+	int t=0;
 	for (uint i=0;i<BLOCK_SIZE;i++)
 	{
 		// Lookup page table and see if page exist in log page
 		Address readAddress;
-		if (logBlock->pages[eventAddress.page] != -1 && logBlock->pages[i] != -1)
-			readAddress.set_linear_address(logBlock->address.real_address + logBlock->pages[i], PAGE);
+		if (logBlock->pages[i] != -1)
+			readAddress.set_linear_address(logBlock->address.get_linear_address() + logBlock->pages[i], PAGE);
 		else if (data_list[lba] != -1)
 			readAddress.set_linear_address(data_list[lba] + i, PAGE);
 		else
 			continue; // Empty page
 
+		if (controller.get_state(readAddress) == EMPTY)
+			continue;
+
 		if (controller.get_state(readAddress) == INVALID) // A page might be invalidated by trim
 			continue;
 
 		Event readEvent = Event(READ, event.get_logical_address(), 1, event.get_start_time());
 		readEvent.set_address(readAddress);
 		controller.issue(readEvent);
-		//event.consolidate_metaevent(readEvent);
 
 		Event writeEvent = Event(WRITE, event.get_logical_address(), 1, event.get_start_time()+readEvent.get_time_taken());
 		writeEvent.set_address(Address(newDataBlock.get_linear_address() + i, PAGE));
 		writeEvent.set_payload((char*)page_data + readAddress.get_linear_address() * PAGE_SIZE);
+		writeEvent.set_replace_address(readAddress);
 		controller.issue(writeEvent);
 
 		//event.consolidate_metaevent(writeEvent);
@@ -350,22 +366,26 @@ bool FtlImpl_Bast::random_merge(LogPageBlock *logBlock, long lba, Event &event)
 		controller.stats.numFTLWrite++;
 		controller.stats.numWLRead++;
 		controller.stats.numWLWrite++;
+		t++;
 	}
 
+//	printf("t %i\n",t);
+
 	// Invalidate inactive pages (LOG and DATA
+
 	Block_manager::instance()->erase_and_invalidate(event, logBlock->address, LOG);
+
 	if (data_list[lba] != -1)
 	{
 		Address a = Address(data_list[lba], PAGE);
+		Block *b2 = controller.get_block_pointer(a);
 		Block_manager::instance()->erase_and_invalidate(event, a, DATA);
 	}
 
-
 	// Update mapping
 	data_list[lba] = newDataBlock.get_linear_address();
 	update_map_block(event);
 
-
 	dispose_logblock(logBlock, lba);
 
 	controller.stats.numLogMergeFull++;

FTLs/bast_ftl.cpp

@@ -87,9 +87,6 @@ enum status FtlImpl_BDftl::read(Event &event)
 	} else { // DFTL lookup
 		resolve_mapping(event, false);
 
-		//MpageByID::iterator it = trans_map.find(dlpn);
-		//MpageByID::iterator it = trans_map[dlpn];
-		//MPage current = *it;
 		MPage current = trans_map[dlpn];
 
 		if (current.ppn != -1)
@@ -162,18 +159,20 @@ enum status FtlImpl_BDftl::write(Event &event)
 
 					MPage current = trans_map[startAdr + i];
 
-					assert(current.ppn == -1);
+					if (current.ppn != -1)
+					{
+						update_translation_map(current, block_map[dlbn].pbn+i);
+						current.create_ts = event.get_start_time();
+						current.modified_ts = event.get_start_time();
+						current.cached = true;
+						trans_map.replace(trans_map.begin()+startAdr+i, current);
 
-					update_translation_map(current, block_map[dlbn].pbn+i);
-					current.create_ts = event.get_start_time();
-					current.modified_ts = event.get_start_time();
-					current.cached = true;
-					trans_map.replace(trans_map.begin()+startAdr+i, current);
+						cmt++;
 
-					cmt++;
+						event.incr_time_taken(RAM_WRITE_DELAY);
+						controller.stats.numMemoryWrite++;
+					}
 
-					event.incr_time_taken(RAM_WRITE_DELAY);
-					controller.stats.numMemoryWrite++;
 				}
 
 				// 4. Set block to non optimal
@@ -281,7 +280,7 @@ enum status FtlImpl_BDftl::trim(Event &event)
 	// Block-level lookup
 	if (block_map[dlbn].optimal)
 	{
-		Address address = Address(block_map[dlbn].pbn, PAGE);
+		Address address = Address(block_map[dlbn].pbn+event.get_logical_address()%BLOCK_SIZE, PAGE);
 		Block *block = controller.get_block_pointer(address);
 		block->invalidate_page(address.page);
 
@@ -293,47 +292,42 @@ enum status FtlImpl_BDftl::trim(Event &event)
 		}
 	} else { // DFTL lookup
 
-		resolve_mapping(event, false);
-
 		MPage current = trans_map[dlpn];
 		if (current.ppn != -1)
 		{
 			Address address = Address(current.ppn, PAGE);
 			Block *block = controller.get_block_pointer(address);
 			block->invalidate_page(address.page);
 
+			evict_specific_page_from_cache(event, dlpn);
+
 			// Update translation map to default values.
 			update_translation_map(current, -1);
-			current.modified_ts = -1;
-			current.cached = false;
 			trans_map.replace(trans_map.begin()+dlpn, current);
 
-			// Remove it from cache too.
-			cmt--;
-
 			event.incr_time_taken(RAM_READ_DELAY);
 			event.incr_time_taken(RAM_WRITE_DELAY);
 			controller.stats.numMemoryRead++;
 			controller.stats.numMemoryWrite++;
+		}
 
-			// Update trim map and update block map if all pages are trimmed. i.e. the state are reseted to optimal.
-			long addressStart = dlpn - dlpn % BLOCK_SIZE;
-			bool allTrimmed = true;
-			for (uint i=addressStart;i<addressStart+BLOCK_SIZE;i++)
-			{
-				if (!trim_map[i])
-					allTrimmed = false;
-			}
+		// Update trim map and update block map if all pages are trimmed. i.e. the state are reseted to optimal.
+		long addressStart = dlpn - dlpn % BLOCK_SIZE;
+		bool allTrimmed = true;
+		for (uint i=addressStart;i<addressStart+BLOCK_SIZE;i++)
+		{
+			if (!trim_map[i])
+				allTrimmed = false;
+		}
 
-			controller.stats.numMemoryRead++; // Trim map looping
+		controller.stats.numMemoryRead++; // Trim map looping
 
-			if (allTrimmed)
-			{
-				block_map[dlbn].pbn = -1;
-				block_map[dlbn].nextPage = 0;
-				block_map[dlbn].optimal = true;
-				controller.stats.numMemoryWrite++; // Update block_map.
-			}
+		if (allTrimmed)
+		{
+			block_map[dlbn].pbn = -1;
+			block_map[dlbn].nextPage = 0;
+			block_map[dlbn].optimal = true;
+			controller.stats.numMemoryWrite++; // Update block_map.
 		}
 	}
 
@@ -442,3 +436,25 @@ bool FtlImpl_BDftl::block_next_new()
 	return (currentDataPage == -1 || currentDataPage % BLOCK_SIZE == BLOCK_SIZE -1);
 }
 
+void FtlImpl_BDftl::print_ftl_statistics()
+{
+	int size = SSD_SIZE * PACKAGE_SIZE * DIE_SIZE * PLANE_SIZE;
+
+	printf("FTL Stats:\n");
+	printf(" Blocks total: %i\n", size);
+
+	int numOptimal = 0;
+	for (int i=0;i<size;i++)
+	{
+		BPage bp = block_map[i];
+		if (bp.optimal)
+		{
+			printf("Optimal: %i\n", i);
+			numOptimal++;
+		}
+
+	}
+
+	printf(" Blocks optimal: %i\n", numOptimal);
+}
+

FTLs/bdftl_ftl.cpp

@@ -105,8 +105,6 @@ enum status FtlImpl_Dftl::trim(Event &event)
 {
 	uint dlpn = event.get_logical_address();
 
-	resolve_mapping(event, false);
-
 	event.set_address(Address(0, PAGE));
 
 	MPage current = trans_map[dlpn];
@@ -117,9 +115,9 @@ enum status FtlImpl_Dftl::trim(Event &event)
 		Block *block = controller.get_block_pointer(address);
 		block->invalidate_page(address.page);
 
+		evict_specific_page_from_cache(event, dlpn);
+
 		update_translation_map(current, -1);
-		current.modified_ts = -1;
-		current.create_ts = -1;
 
 		trans_map.replace(trans_map.begin()+dlpn, current);
 	}

FTLs/dftl_ftl.cpp

@@ -171,41 +171,20 @@ void FtlImpl_DftlParent::resolve_mapping(Event &event, bool isWrite)
 
 		MPage current = trans_map[dlpn];
 		current.modified_ts = event.get_start_time();
+		if (isWrite)
+			current.modified_ts++;
 		current.create_ts = event.get_start_time();
 		current.cached = true;
 		trans_map.replace(trans_map.begin()+dlpn, current);
 
-//		MpageByModified::iterator iter = boost::multi_index::get<1>(trans_map).begin();
-//		printf("--------\n");
-//		for (int i=0;i<5;i++)
-//		{
-//			printf("@@@ %i %i %f %f %i\n", (*iter).vpn, (*iter).ppn , (*iter).create_ts, (*iter).modified_ts, (*iter).cached);
-//			++iter;
-//		}
-//
-//		MpageByModified::iterator iterE = boost::multi_index::get<1>(trans_map).end();
-//
-//		for (int i=0;i<20;i++)
-//		{
-//			--iterE;
-//			printf("$$$ %i %i %f %f %i\n", (*iterE).vpn, (*iterE).ppn , (*iterE).create_ts, (*iterE).modified_ts, (*iterE).cached);
-//
-//		}
-
 		cmt++;
-
-
 	}
 }
 
 void FtlImpl_DftlParent::evict_page_from_cache(Event &event)
 {
-	int x = 0;
-	int y = 0;
-
 	while (cmt >= totalCMTentries)
 	{
-		x++;
 		// Find page to evict
 		MpageByModified::iterator evictit = boost::multi_index::get<1>(trans_map).begin();
 		MPage evictPage = *evictit;
@@ -239,7 +218,6 @@ void FtlImpl_DftlParent::evict_page_from_cache(Event &event)
 			event.incr_time_taken(write_event.get_time_taken());
 			controller.stats.numFTLWrite++;
 			controller.stats.numGCWrite++;
-			y++;
 		}
 
 		// Remove page from cache.
@@ -249,7 +227,54 @@ void FtlImpl_DftlParent::evict_page_from_cache(Event &event)
 		reset_MPage(evictPage);
 		trans_map.replace(trans_map.begin()+evictPage.vpn, evictPage);
 	}
-	//printf("%i %i %i \n", cmt,x , y);
+}
+
+void FtlImpl_DftlParent::evict_specific_page_from_cache(Event &event, long lba)
+{
+		// Find page to evict
+		MPage evictPage = trans_map[lba];
+
+		if (!evictPage.cached)
+			return;
+
+		assert(evictPage.cached && evictPage.create_ts >= 0 && evictPage.modified_ts >= 0);
+
+		if (evictPage.create_ts != evictPage.modified_ts)
+		{
+			// Evict page
+			// Inform the ssd model that it should invalidate the previous page.
+			// Calculate the start address of the translation page.
+			int vpnBase = evictPage.vpn - evictPage.vpn % addressPerPage;
+
+			for (int i=0;i<addressPerPage;i++)
+			{
+				MPage cur = trans_map[vpnBase+i];
+				if (cur.cached)
+				{
+					cur.create_ts = cur.modified_ts;
+					trans_map.replace(trans_map.begin()+vpnBase+i, cur);
+				}
+			}
+
+			// Simulate the write to translate page
+			Event write_event = Event(WRITE, event.get_logical_address(), 1, event.get_start_time());
+			write_event.set_address(Address(0, PAGE));
+			write_event.set_noop(true);
+
+			if (controller.issue(write_event) == FAILURE) {	assert(false);}
+
+			event.incr_time_taken(write_event.get_time_taken());
+			controller.stats.numFTLWrite++;
+			controller.stats.numGCWrite++;
+		}
+
+		// Remove page from cache.
+		cmt--;
+
+		evictPage.cached = false;
+		reset_MPage(evictPage);
+		trans_map.replace(trans_map.begin()+evictPage.vpn, evictPage);
+
 }
 
 void FtlImpl_DftlParent::update_translation_map(FtlImpl_DftlParent::MPage &mpage, long ppn)