From 2a2c3af3804b4c6d97618ec6ee3233cf03ba9f51 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 23 Feb 2015 00:20:17 +0100
Subject: [PATCH] host/dump: optimize get_bits / decode_rle since we can now
 have large dumps

---
 litescope/host/dump/__init__.py | 43 +++++++++++++--------------------
 test/test_la.py                 |  2 +-
 test/test_regs.py               |  1 -
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/litescope/host/dump/__init__.py b/litescope/host/dump/__init__.py
index 8e67c9f27..902c0a4e5 100644
--- a/litescope/host/dump/__init__.py
+++ b/litescope/host/dump/__init__.py
@@ -10,16 +10,12 @@ def dec2bin(d, nb=0):
 			d=d>>1
 	return b.zfill(nb)
 
-def get_bits(values, width, low, high=None):
+def get_bits(values, low, high=None):
 	r = []
+	if high is None:
+		high = low+1
 	for val in values:
-		t = dec2bin(val, width)[::-1]
-		if high == None:
-			t = t[low]
-		else:
-			t = t[low:high]
-		t = t[::-1]
-		t = int(t,2)
+		t = (val >> low) & (2**(high-low)-1)
 		r.append(t)
 	return r
 
@@ -29,7 +25,7 @@ class Dat(list):
 
 	def __getitem__(self, key):
 		if isinstance(key, int):
-			return get_bits(self, self.width, key)
+			return get_bits(self, key)
 		elif isinstance(key, slice):
 			if key.start != None:
 				start = key.start
@@ -43,28 +39,23 @@ class Dat(list):
 				stop = self.width
 			if key.step != None:
 				raise KeyError
-			return get_bits(self, self.width, start, stop)
+			return get_bits(self, start, stop)
 		else:
 			raise KeyError
 
 	def decode_rle(self):
-		rle_bit = self[-1]
-		rle_dat = self[:self.width-1]
-
-		dat = Dat(self.width)
-		i=0
-		last = 0
-		for d in self:
-			if rle_bit[i]:
-				if len(dat) >= 1:
-					# FIX ME... why is rle_dat in reverse order...
-					for j in range(int(dec2bin(rle_dat[i])[::-1],2)):
-						dat.append(last)
+		datas = Dat(self.width-1)
+		last_data = 0
+		for data in self:
+			rle = data >> (self.width-1)
+			data = data & (2**(self.width-1)-1)
+			if rle:
+				for i in range(data):
+					datas.append(last_data)
 			else:
-				dat.append(d)
-				last = d
-			i +=1
-		return dat
+				datas.append(data)
+				last_data = data
+		return datas
 
 class Var:
 	def __init__(self, name, width, values=[], type="wire", default="x"):
diff --git a/test/test_la.py b/test/test_la.py
index 641b693b3..9f7aba94c 100644
--- a/test/test_la.py
+++ b/test/test_la.py
@@ -9,7 +9,7 @@ la = LiteScopeLADriver(wb.regs, "la", debug=True)
 cond = {} # trigger on cnt0 = 128
 la.configure_term(port=0, cond=cond)
 la.configure_sum("term")
-la.configure_subsampler(1)
+la.configure_subsampler(8)
 #la.configure_qualifier(1)
 la.configure_rle(1)
 la.run(offset=128, length=256)
diff --git a/test/test_regs.py b/test/test_regs.py
index bb59b641a..982f849c5 100644
--- a/test/test_regs.py
+++ b/test/test_regs.py
@@ -6,6 +6,5 @@ regs = wb.regs
 print("sysid     : 0x%04x" %regs.identifier_sysid.read())
 print("revision  : 0x%04x" %regs.identifier_revision.read())
 print("frequency : %d MHz" %(regs.identifier_frequency.read()/1000000))
-print("l2_size   : %d" %regs.identifier_l2_size.read())
 ###
 wb.close()