adding LMA processing of DQ_ODELAY vs DQS_ODELAY (4a9e4b55) · Commits · Elphel / x393

py393/get_test_dq_dqs_data.py

+401 −3

File changed.

Preview size limit exceeded, changes collapsed.

py393/x393_lma.py

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -88,9 +88,9 @@ def test_data(meas_delays,
	for pData in data: # 16 DQs, each None nor a pair of lists for inPhase in (0,1), each a pair of edges, each a pair of (dly,diff)		for pData in data: # 16 DQs, each None nor a pair of lists for inPhase in (0,1), each a pair of edges, each a pair of (dly,diff)
	if pData and (not pData[typ] is None):		if pData and (not pData[typ] is None):
	if pData[typ][1] is None:		if pData[typ][1] is None:
	print ("%d"%(pData[typ]+halfStep),end=" ")		print ("%d"%(pData[typ][0]+halfStep),end=" ")
	else:		else:
	print ("%d"%(pData[typ]),end=" ")		print ("%d"%(pData[typ][0]),end=" ")
	else:		else:
	print ("x",end=" ")		print ("x",end=" ")
	print()		print()
	@@ -623,8 +623,8 @@ class X393LMA(object):
	if corr[x] > corr[xmx]:		if corr[x] > corr[xmx]:
	xmx=x		xmx=x
	span=max(int(round(est_bin_period/8)),4)		span=max(int(round(est_bin_period/8)),4)
	corr_low=max(corr_low,xmx-span)		corr_low=max(corr_low,xmx-span,-num_hist_steps//2)
	corr_high=min(corr_high,xmx+span)		corr_high=min(corr_high,xmx+span,num_hist_steps//2-1)
	if quiet <1:		if quiet <1:
	print ("corrected corr_low=%d, corr_high=%d, xmx=%d"%(corr_low, corr_high, xmx))		print ("corrected corr_low=%d, corr_high=%d, xmx=%d"%(corr_low, corr_high, xmx))
	S0=0		S0=0
	@@ -649,8 +649,8 @@ class X393LMA(object):
	mx=y		mx=y
	xmx=x		xmx=x
	span=max(int(round(corr_bin_period/8)),4)		span=max(int(round(corr_bin_period/8)),4)
	corr_low=max(corr_low,xmx-span)		corr_low=max(corr_low,xmx-span,-num_hist_steps//2)
	corr_high=min(corr_high,xmx+span)		corr_high=min(corr_high,xmx+span,num_hist_steps//2-1)
	if quiet < 1:		if quiet < 1:
	print ("corrected corr_low=%d, corr_high=%d, xmx=%d"%(corr_low, corr_high, xmx))		print ("corrected corr_low=%d, corr_high=%d, xmx=%d"%(corr_low, corr_high, xmx))
	S0=0		S0=0
	@@ -682,7 +682,7 @@ class X393LMA(object):
	xSpan= corr_bin_period/2		xSpan= corr_bin_period/2
	#scanning in bin, not dly steps		#scanning in bin, not dly steps
	corr_low= max(int(b_start/bin_size-xSpan),-(num_hist_steps//2))		corr_low= max(int(b_start/bin_size-xSpan),-(num_hist_steps//2))
	corr_high=min(int(b_start/bin_size+xSpan), (num_hist_steps//2))		corr_high=min(int(b_start/bin_size+xSpan), (num_hist_steps//2)-1)
	xmx=None		xmx=None
	mx=0		mx=0
	if quiet < 1:		if quiet < 1:
	@@ -718,7 +718,7 @@ class X393LMA(object):
	xSpan= corr_bin_period/2		xSpan= corr_bin_period/2
	#scanning in bin, not dly steps		#scanning in bin, not dly steps
	corr_low= max(int(b_start/bin_size-xSpan),-(num_hist_steps//2))		corr_low= max(int(b_start/bin_size-xSpan),-(num_hist_steps//2))
	corr_high=min(int(b_start/bin_size+xSpan), (num_hist_steps//2))		corr_high=min(int(b_start/bin_size+xSpan), (num_hist_steps//2)-1)
	xmx=None		xmx=None
	mx=0		mx=0
	if quiet < 1:		if quiet < 1:
	@@ -729,8 +729,8 @@ class X393LMA(object):
	mx=y		mx=y
	xmx=x		xmx=x
	span=max(int(round(corr_bin_period/8)),4)		span=max(int(round(corr_bin_period/8)),4)
	corr_low=max(corr_low,xmx-span)		corr_low=max(corr_low,xmx-span,-num_hist_steps//2)
	corr_high=min(corr_high,xmx+span)		corr_high=min(corr_high,xmx+span,num_hist_steps//2-1)
	if quiet < 1:		if quiet < 1:
	print ("DQ[%d], series=%d corrected corr_low=%d, corr_high=%d, xmx=%d"%(b, t, corr_low, corr_high, xmx))		print ("DQ[%d], series=%d corrected corr_low=%d, corr_high=%d, xmx=%d"%(b, t, corr_low, corr_high, xmx))
	S0=0		S0=0

py393/x393_mcntrl_adjust.py

+137 −22

Original line number	Original line	Diff line number	Diff line
	@@ -2888,8 +2888,8 @@ class X393McntrlAdjust(object):
	for d in meas_data:		for d in meas_data:
	print("%s,"%(str(d)))		print("%s,"%(str(d)))
	print("]")		print("]")
	rdict={"patt_prim_steps": compare_prim_steps,		rdict={"write_prim_steps": compare_prim_steps,
	"patt_meas_data": meas_data} # TODO: May delete after LMA fitting		"write_meas_data": meas_data} # TODO: May delete after LMA fitting
	self.adjustment_state.update(rdict)		self.adjustment_state.update(rdict)


	@@ -2905,8 +2905,11 @@ class X393McntrlAdjust(object):
	to reduce debugging time for nest stages		to reduce debugging time for nest stages
	"""		"""
	self.adjustment_state["dqi_dqsi"]= get_test_dq_dqs_data.get_dqi_dqsi()		self.adjustment_state["dqi_dqsi"]= get_test_dq_dqs_data.get_dqi_dqsi()
	self.adjustment_state["maxErrDqs"]= get_test_dq_dqs_data.get_maxErrDqs()		self.adjustment_state["maxErrDqsi"]= get_test_dq_dqs_data.get_maxErrDqsi()
	self.adjustment_state["dqi_dqsi_parameters"]= get_test_dq_dqs_data.get_dqi_dqsi_parameters()		self.adjustment_state["dqi_dqsi_parameters"]= get_test_dq_dqs_data.get_dqi_dqsi_parameters()
			self.adjustment_state["dqo_dqso"]= get_test_dq_dqs_data.get_dqo_dqso()
			self.adjustment_state["maxErrDqso"]= get_test_dq_dqs_data.get_maxErrDqso()
			self.adjustment_state["dqo_dqso_parameters"]= get_test_dq_dqs_data.get_dqo_dqso_parameters()
	self.adjustment_state.update(get_test_dq_dqs_data.get_adjust_cmda_odelay())		self.adjustment_state.update(get_test_dq_dqs_data.get_adjust_cmda_odelay())
	self.adjustment_state.update(get_test_dq_dqs_data.get_wlev_data())		self.adjustment_state.update(get_test_dq_dqs_data.get_wlev_data())
	self.adjustment_state.update(get_test_dq_dqs_data.get_dqsi_phase())		self.adjustment_state.update(get_test_dq_dqs_data.get_dqsi_phase())
	@@ -2940,8 +2943,8 @@ class X393McntrlAdjust(object):
	if isinstance (data_set_number,(int,long)) and (data_set_number>=0) :		if isinstance (data_set_number,(int,long)) and (data_set_number>=0) :
	if quiet < 4:		if quiet < 4:
	print("Using hard-coded data set #%d"%data_set_number)		print("Using hard-coded data set #%d"%data_set_number)
	compare_prim_steps=get_test_dq_dqs_data.get_compare_prim_steps(data_set_number)		compare_prim_steps=get_test_dq_dqs_data.get_compare_prim_steps_in(data_set_number)
	meas_data=get_test_dq_dqs_data.get_data(data_set_number)		meas_data=get_test_dq_dqs_data.get_data_in(data_set_number)
	else:		else:
	if quiet < 4:		if quiet < 4:
	print("Using measured data set")		print("Using measured data set")
	@@ -2986,10 +2989,10 @@ class X393McntrlAdjust(object):

	self.adjustment_state["dqi_dqsi_parameters"]=rslt.pop('parameters')		self.adjustment_state["dqi_dqsi_parameters"]=rslt.pop('parameters')
	try:		try:
	self.adjustment_state["maxErrDqs"]=rslt.pop('maxErrDqs')		self.adjustment_state["maxErrDqsi"]=rslt.pop('maxErrDqs')
	if quiet<5:		if quiet<5:
	print("maxErrDqs={")		print("maxErrDqsi={")
	for k,v in self.adjustment_state["maxErrDqs"].items():		for k,v in self.adjustment_state["maxErrDqsi"].items():
	print ("'%s':%s,"%(k,str(v)))		print ("'%s':%s,"%(k,str(v)))
	print ("}")		print ("}")
	except:		except:
	@@ -3056,19 +3059,107 @@ class X393McntrlAdjust(object):
	self.adjustment_state.update(dqsi_phase)		self.adjustment_state.update(dqsi_phase)
	return dqsi_phase		return dqsi_phase

			def proc_dqo_dqso(self,
			lane="all",
			bin_size=5,
			primary_set=2,
			# compare_prim_steps=True, # while scanning, compare this delay with 1 less by primary(not fine) step,
			# # save None for fraction in unknown (previous -0.5, next +0.5)
			data_set_number=0, # not number - use measured data
			scale_w=0.0, # weight for "uncertain" values (where samples chane from all 0 to all 1 in one step)

			quiet=1):
			"""
			Run DQ vs DQS fitting for one data lane (0 or 1) using earlier acquired hard-coded data
			@param lane byte lane to process (or non-number - process all byte lanes of the device)
			@param bin_size bin size for the histograms (should be 5/10/20/40)
			@param primary_set which of the data edge series to use as leading (other will be trailing by 180)
			@param data_set_number select one of the hard-coded data sets (sets 0 and 1 use comparing with the data 1 fine step below
			set #2 (default) used measurement with previous primary step measurement (will not suffer from
			fine range wider than on primary step)
			If not number or <0 - use measured data
			@param scale_w weight for "uncertain" values (where samples change from all 0 to all 1 in one step)
			For sufficient data 0.0 is OK (and seems to work better)- only "analog" samples are considered
			@return 3-element dictionary of ('early','nominal','late'), each being None or a 160-element list,
			each element being either None, or a list of 3 best DQ delay values for the DQS delay (some mey be None too)
			"""
			if quiet < 3:
			print ("proc_dqi_dqsi(): scale_w=%f"%(scale_w))
			if isinstance (data_set_number,(int,long)) and (data_set_number>=0) :
			if quiet < 4:
			print("Using hard-coded data set #%d"%data_set_number)
			compare_prim_steps=get_test_dq_dqs_data.get_compare_prim_steps_out(data_set_number)
			meas_data=get_test_dq_dqs_data.get_data_out(data_set_number)
			else:
			if quiet < 4:
			print("Using measured data set")
			try:
			compare_prim_steps=self.adjustment_state["wtite_prim_steps"]
			meas_data= self.adjustment_state["write_meas_data"]
			except:
			print ("Pattern-measured data is not available, exiting")
			return
			meas_delays=[]
			for data in meas_data:
			if data:
			bits=[None]*16
			for b,pData in enumerate(data):
			if pData:
			bits[b]=[None]*4
			for inPhase in (0,1):
			if pData[inPhase]:
			for e in (0,1):
			if pData[inPhase][e]:
			bits[b][inPhase*2+e]=pData[inPhase][e]# [0]
			meas_delays.append(bits)
			if quiet<1:
			x393_lma.test_data(meas_delays,compare_prim_steps,quiet)
			lma=x393_lma.X393LMA()
			rslt = lma.lma_fit_dqi_dqsi(lane,
			bin_size,
			1000.0*self.x393_mcntrl_timing.get_dly_steps()['SDCLK_PERIOD'], # 2500.0, # clk_period,
			78.0, # dly_step_ds,
			primary_set,
			meas_delays,
			compare_prim_steps,
			scale_w,
			quiet)
			if quiet<5:
			lma.showENLresults(rslt)
			if quiet<5:
			print ("dqi_dqsi={")
			for k,v in rslt.items():
			print ("'%s':%s,"%(k,str(v)))
			print ("}")

			self.adjustment_state["dqi_dqsi_parameters"]=rslt.pop('parameters')
			try:
			self.adjustment_state["maxErrDqso"]=rslt.pop('maxErrDqs')
			if quiet<5:
			print("maxErrDqso={")
			for k,v in self.adjustment_state["maxErrDqso"].items():
			print ("'%s':%s,"%(k,str(v)))
			print ("}")
			except:
			print ("maxErrDqs does not exist")

			self.adjustment_state["dqo_dqso"]=rslt
			return rslt


	def show_all_vs_phase(self, load_hardcoded=False):		def show_all_vs_phase(self, load_hardcoded=False):
	if load_hardcoded:		if load_hardcoded:
	self.load_hardcoded_data()		self.load_hardcoded_data()
	rslt_names=("early","nominal","late")		rslt_names=("early","nominal","late")
	DQvDQS=self.adjustment_state["dqi_dqsi"]		DQIvDQSI=self.adjustment_state["dqi_dqsi"]
			DQOvDQSO=self.adjustment_state["dqo_dqso"]
	cmda_bspe=self.adjustment_state['cmda_bspe']		cmda_bspe=self.adjustment_state['cmda_bspe']
	dqsi_phase=self.adjustment_state['dqsi_phase']		dqsi_phase=self.adjustment_state['dqsi_phase']
	wlev_dqs_bspe=self.adjustment_state['wlev_dqs_bspe']		wlev_dqs_bspe=self.adjustment_state['wlev_dqs_bspe']
	numBits=0		numBits=0
	for n in DQvDQS:		for n in DQIvDQSI:
	try:		try:
	for d in DQvDQS[n]:		for d in DQIvDQSI[n]:
	try:		try:
	numBits=len(d)		numBits=len(d)
	break		break
	@@ -3080,22 +3171,30 @@ class X393McntrlAdjust(object):
	if not numBits:		if not numBits:
	raise Exception("showENLresults(): No no-None data provided")		raise Exception("showENLresults(): No no-None data provided")
	numLanes=numBits//8		numLanes=numBits//8
	enl_list=[]		enl_list_in=[]
			for k in rslt_names:
			if DQIvDQSI[k]:
			enl_list_in.append(k)
			enl_list_out=[]
	for k in rslt_names:		for k in rslt_names:
	if DQvDQS[k]:		if DQOvDQSO[k]:
	enl_list.append(k)		enl_list_out.append(k)

	timing=self.x393_mcntrl_timing.get_dly_steps()		timing=self.x393_mcntrl_timing.get_dly_steps()
	numPhaseSteps= int(timing['SDCLK_PERIOD']/timing['PHASE_STEP']+0.5)		numPhaseSteps= int(timing['SDCLK_PERIOD']/timing['PHASE_STEP']+0.5)

	print("Phase CMDA",end=" ")		print("Phase CMDA",end=" ")
	for lane in range(numLanes):		for lane in range(numLanes):
	print("DQS%di"%(lane),end=" ")		print("DQS%di"%(lane),end=" ")
	for k in enl_list:		for k in enl_list_in:
	for b in range(numBits):		for b in range(numBits):
	print("%s-DQ%di"%(k.upper()[0], b),end=" ")		print("%s-DQ%di"%(k.upper()[0], b),end=" ")
	for lane in range(numLanes):		for lane in range(numLanes):
	print("DQS%d0"%(lane),end=" ")		print("DQS%d0"%(lane),end=" ")
	#TODO: add DQ%do		#TODO: add DQ%do
			for k in enl_list_out:
			for b in range(numBits):
			print("%s-DQ%do"%(k.upper()[0], b),end=" ")
	print()		print()
	for phase in range(numPhaseSteps):		for phase in range(numPhaseSteps):
	print("%d"%(phase),end=" ")		print("%d"%(phase),end=" ")
	@@ -3111,25 +3210,41 @@ class X393McntrlAdjust(object):
	print("%d"%(dqsi_phase[lane][phase]),end=" ")		print("%d"%(dqsi_phase[lane][phase]),end=" ")
	else:		else:
	print ("?",end=" ")		print ("?",end=" ")
	#DQ_IDEALY, with half/clock variants		#DQ_IDELAY, with half/clock variants
	for k in enl_list:		for k in enl_list_in:
	for b in range(numBits):		for b in range(numBits):
	lane=b//8		lane=b//8
	dqs_dly=dqsi_phase[lane][phase]		dqs_dly=dqsi_phase[lane][phase]
	valid = not dqs_dly is None		valid = not dqs_dly is None
	valid = valid and not DQvDQS[k] is None		valid = valid and not DQIvDQSI[k] is None
	valid = valid and not DQvDQS[k][dqs_dly] is None		valid = valid and not DQIvDQSI[k][dqs_dly] is None
	valid = valid and not DQvDQS[k][dqs_dly][b] is None		valid = valid and not DQIvDQSI[k][dqs_dly][b] is None
	if valid:		if valid:
	print("%d"%(DQvDQS[k][dqs_dly][b]),end=" ")		print("%d"%(DQIvDQSI[k][dqs_dly][b]),end=" ")
	else:		else:
	print ("?",end=" ")		print ("?",end=" ")
	#DQS_ODEALY		#DQS_ODELAY
	for lane in range(numLanes):		for lane in range(numLanes):
	if (not wlev_dqs_bspe[lane][phase] is None) and (not wlev_dqs_bspe[lane][phase]['ldly'] is None):		if (not wlev_dqs_bspe[lane][phase] is None) and (not wlev_dqs_bspe[lane][phase]['ldly'] is None):
	print("%d"%(wlev_dqs_bspe[lane][phase]['ldly']),end=" ")		print("%d"%(wlev_dqs_bspe[lane][phase]['ldly']),end=" ")
	else:		else:
	print ("?",end=" ")		print ("?",end=" ")
			#DQ_IDELAY, with half/clock variants
			for k in enl_list_out:
			for b in range(numBits):
			lane=b//8
			if (not wlev_dqs_bspe[lane][phase] is None):
			dqs_dly=wlev_dqs_bspe[lane][phase]['ldly']
			else:
			dqs_dly=None
			valid = not dqs_dly is None
			valid = valid and not DQOvDQSO[k] is None
			valid = valid and not DQOvDQSO[k][dqs_dly] is None
			valid = valid and not DQOvDQSO[k][dqs_dly][b] is None
			if valid:
			print("%d"%(DQOvDQSO[k][dqs_dly][b]),end=" ")
			else:
			print ("?",end=" ")
	print()		print()