Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ba8b24df57d4
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 94b62eff8b4a
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 25, 2015

  1. Copy the full SHA
    ff11cb9 View commit details
  2. Copy the full SHA
    69e9032 View commit details
  3. Copy the full SHA
    94b62ef View commit details
Showing with 11 additions and 8 deletions.
  1. +4 −1 misoclib/mem/sdram/core/lasmicon/__init__.py
  2. +1 −1 software/libcompiler-rt/Makefile
  3. +6 −6 software/memtest/main.c
5 changes: 4 additions & 1 deletion misoclib/mem/sdram/core/lasmicon/__init__.py
Original file line number Diff line number Diff line change
@@ -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):
2 changes: 1 addition & 1 deletion software/libcompiler-rt/Makefile
Original file line number Diff line number Diff line change
@@ -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

12 changes: 6 additions & 6 deletions software/memtest/main.c
Original file line number Diff line number Diff line change
@@ -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;
}