m-labs · Mar 25, 2015 · Mar 25, 2015 · Mar 25, 2015
Showing with 11 additions and 8 deletions.

+4 −1 misoclib/mem/sdram/core/lasmicon/__init__.py

+1 −1 software/libcompiler-rt/Makefile

+6 −6 software/memtest/main.c
diff --git a/misoclib/mem/sdram/core/lasmicon/__init__.py b/misoclib/mem/sdram/core/lasmicon/__init__.py
@@ -17,7 +17,10 @@ def __init__(self, req_queue_size=8,
 		self.write_time = write_time
 		self.with_l2 = with_l2
 		self.l2_size = l2_size
-		self.with_bandwidth = with_bandwidth
+		if with_memtest:
+			self.with_bandwidth = True
+		else:
+			self.with_bandwidth = with_bandwidth
 		self.with_memtest = with_memtest
 
 class LASMIcon(Module):

diff --git a/software/libcompiler-rt/Makefile b/software/libcompiler-rt/Makefile
@@ -5,7 +5,7 @@ CFLAGS+=-D_YUGA_LITTLE_ENDIAN=0 -D_YUGA_BIG_ENDIAN=1 -Wno-missing-prototypes
 
 OBJECTS=divsi3.o modsi3.o comparedf2.o negsf2.o negdf2.o addsf3.o subsf3.o mulsf3.o divsf3.o lshrdi3.o muldi3.o divdi3.o ashldi3.o ashrdi3.o udivmoddi4.o \
   floatsisf.o floatunsisf.o fixsfsi.o fixunssfsi.o adddf3.o subdf3.o muldf3.o divdf3.o floatsidf.o floatunsidf.o floatdidf.o fixdfsi.o fixunsdfsi.o \
-  clzsi2.o ctzsi2.o udivdi3.o umoddi3.o moddi3.o
+  clzsi2.o ctzsi2.o udivdi3.o umoddi3.o moddi3.o ucmpdi2.o
 
 all: libcompiler-rt.a
 

diff --git a/software/memtest/main.c b/software/memtest/main.c
@@ -17,9 +17,9 @@ static void membw_service(void)
 	unsigned int rdb, wrb;
 
 	if(elapsed(&last_event, identifier_frequency_read())) {
-		lasmicon_bandwidth_update_write(1);
-		nr = lasmicon_bandwidth_nreads_read();
-		nw = lasmicon_bandwidth_nwrites_read();
+		sdram_controller_bandwidth_update_write(1);
+		nr = sdram_controller_bandwidth_nreads_read();
+		nw = sdram_controller_bandwidth_nwrites_read();
 		f = identifier_frequency_read();
 		rdb = (nr*f >> (24 - 7))/1000000ULL;
 		wrb = (nw*f >> (24 - 7))/1000000ULL;
@@ -75,21 +75,21 @@ int main(void)
 	irq_setmask(0);
 	irq_setie(1);
 	uart_init();
-	
+
 	puts("Memory testing software built "__DATE__" "__TIME__"\n");
 
 	if((memtest_w_magic_read() != 0x361f) || (memtest_r_magic_read() != 0x361f)) {
 		printf("Memory test cores not detected\n");
 		while(1);
 	}
-	
+
 	time_init();
 
 	flush_l2_cache();
 	while(1) {
 		memtest_service();
 		membw_service();
 	}
-	
+
 	return 0;
 }