Skip to content

X
x393
Commit 8729da71 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

bug fixes

parent f92b8da3
Hide whitespace changes
Inline Side-by-side
Showing with 296 additions and 112 deletions
py393/x393_mcntrl_adjust.py
View file @ 8729da71
...@@ -559,6 +559,7 @@ class X393McntrlAdjust(object): ...@@ -559,6 +559,7 @@ class X393McntrlAdjust(object):
cost=None, cost=None,
refresh=True, refresh=True,
forgive_missing=False, forgive_missing=False,
maxPhaseErrorsPS=None,
quiet=3): quiet=3):
""" """
Set phase and all relevant delays (ones with non None filters) Set phase and all relevant delays (ones with non None filters)
...@@ -571,6 +572,7 @@ class X393McntrlAdjust(object): ...@@ -571,6 +572,7 @@ class X393McntrlAdjust(object):
@param filter_dqo filter for DQS output delays, @param filter_dqo filter for DQS output delays,
@param refresh - turn refresh OFF before and ON after changing the delays and phase @param refresh - turn refresh OFF before and ON after changing the delays and phase
@param forgive_missing do not raise exceptions on missing data - just skip that delay group @param forgive_missing do not raise exceptions on missing data - just skip that delay group
@param maxPhaseErrorsPS - if present, specifies maximal phase errors (in ps) for cmda, dqsi and dqso (each can be None)
@param quiet Reduce output @param quiet Reduce output
@return used delays dictionary on success, None on failure @return used delays dictionary on success, None on failure
raises Exception() if any delays with non-None filters miss required data raises Exception() if any delays with non-None filters miss required data
...@@ -586,6 +588,7 @@ class X393McntrlAdjust(object): ...@@ -586,6 +588,7 @@ class X393McntrlAdjust(object):
cost, ',', cost, ',',
refresh, ',', refresh, ',',
forgive_missing, ',', forgive_missing, ',',
maxPhaseErrorsPS,',',
quiet,")") quiet,")")
if phase is None: if phase is None:
try: try:
...@@ -606,6 +609,7 @@ class X393McntrlAdjust(object): ...@@ -606,6 +609,7 @@ class X393McntrlAdjust(object):
filter_dqo= filter_dqo, filter_dqo= filter_dqo,
cost= cost, cost= cost,
forgive_missing= forgive_missing, forgive_missing= forgive_missing,
maxPhaseErrorsPS=maxPhaseErrorsPS,
quiet= quiet) quiet= quiet)
if delays is None: #May also be an empty dictionary? if delays is None: #May also be an empty dictionary?
return None return None
...@@ -655,6 +659,7 @@ class X393McntrlAdjust(object): ...@@ -655,6 +659,7 @@ class X393McntrlAdjust(object):
filter_dqo= None, filter_dqo= None,
forgive_missing=False, forgive_missing=False,
cost=None, cost=None,
maxPhaseErrorsPS=None,
quiet=3): quiet=3):
""" """
Calculate dictionary of delays for specific phase. Only Non-None filters will generate items in the dictionary Calculate dictionary of delays for specific phase. Only Non-None filters will generate items in the dictionary
...@@ -666,16 +671,23 @@ class X393McntrlAdjust(object): ...@@ -666,16 +671,23 @@ class X393McntrlAdjust(object):
@param filter_dqso filter for DQS output delays @param filter_dqso filter for DQS output delays
@param filter_dqo filter for DQS output delays, @param filter_dqo filter for DQS output delays,
@param forgive_missing do not raise exceptions on missing data - just skip that delay group @param forgive_missing do not raise exceptions on missing data - just skip that delay group
@param cost - cost of switching to a higher(lower) delay branch as a fraction of a period
@param maxPhaseErrorsPS - if present, specifies maximal phase errors (in ps) for cmda, dqsi and dqso (each can be None)
@param quiet Reduce output @param quiet Reduce output
@return None if not possible for at east one non-None filter, otherwise a dictionary of delay to set. @return None if not possible for at east one non-None filter, otherwise a dictionary of delay to set.
Each value is either number set to all or a tuple/list (to set individual values) Each value is either number set to all or a tuple/list (to set individual values)
raises Exception if required data is missing raises Exception if required data is missing
""" """
filters=dict(zip(SIG_LIST,[filter_cmda,filter_dqsi,filter_dqi,filter_dqso,filter_dqo])) filters=dict(zip(SIG_LIST,[filter_cmda,filter_dqsi,filter_dqi,filter_dqso,filter_dqo]))
dly_steps=self.x393_mcntrl_timing.get_dly_steps()
numPhaseSteps= int(dly_steps['SDCLK_PERIOD']/dly_steps['PHASE_STEP']+0.5)
phaseStep=1000.0*dly_steps['PHASE_STEP']
if quiet < 3:
print ("get_all_delays(): maxPhaseErrorsPS=",maxPhaseErrorsPS)
# assert (not maxPhaseErrorsPS is None)
if phase is None: if phase is None:
all_delays=[] all_delays=[]
dly_steps=self.x393_mcntrl_timing.get_dly_steps()
numPhaseSteps= int(dly_steps['SDCLK_PERIOD']/dly_steps['PHASE_STEP']+0.5)
for phase in range(numPhaseSteps): for phase in range(numPhaseSteps):
all_delays.append(self.get_all_delays(phase=phase, all_delays.append(self.get_all_delays(phase=phase,
filter_cmda = filter_cmda, filter_cmda = filter_cmda,
...@@ -683,18 +695,35 @@ class X393McntrlAdjust(object): ...@@ -683,18 +695,35 @@ class X393McntrlAdjust(object):
filter_dqi = filter_dqi, filter_dqi = filter_dqi,
filter_dqso = filter_dqso, filter_dqso = filter_dqso,
filter_dqo = filter_dqo, filter_dqo = filter_dqo,
cost= cost,
forgive_missing = forgive_missing, forgive_missing = forgive_missing,
cost= cost,
maxPhaseErrorsPS=maxPhaseErrorsPS,
quiet= quiet)) quiet= quiet))
return all_delays return all_delays
delays={} delays={}
for k in SIG_LIST: phaseTolerances={}
if quiet < 2:
print("maxPhaseErrorsPS=",maxPhaseErrorsPS)
if maxPhaseErrorsPS:
if isinstance (maxPhaseErrorsPS, (float, int,long)):
maxPhaseErrorsPS=(maxPhaseErrorsPS,maxPhaseErrorsPS,maxPhaseErrorsPS)
if maxPhaseErrorsPS[0]:
phaseTolerances[CMDA_KEY]= int(round(maxPhaseErrorsPS[0]/phaseStep))
if maxPhaseErrorsPS[1]:
phaseTolerances[DQSI_KEY]= int(round(maxPhaseErrorsPS[1]/phaseStep))
if maxPhaseErrorsPS[2]:
phaseTolerances[DQSO_KEY]= int(round(maxPhaseErrorsPS[2]/phaseStep))
if (quiet <2):
print ("phaseTolerances=",phaseTolerances)
all_good=True
for k in SIG_LIST: #CMDA first, DQS before DQ
if not filters[k] is None: if not filters[k] is None:
#special case for cmda, and if self.adjustment_state['addr_odelay'] is not available #special case for cmda, and if self.adjustment_state['addr_odelay'] is not available
if (k == CMDA_KEY) and ((not 'addr_odelay' in self.adjustment_state) or if (k == CMDA_KEY) and ((not 'addr_odelay' in self.adjustment_state) or
(isinstance (filter_cmda,str) and (len(filter_cmda)>1) and (filter_cmda.upper()[0]=='S'))): (isinstance (filter_cmda,str) and (len(filter_cmda)>1) and (filter_cmda.upper()[0]=='S'))):
# not processing phaseTolerances in this mode
if quiet < 3: if quiet < 3:
print ("\n------ processing '%s' using self.adjustment_state['cmda_bspe'], filter= %s"%(k,str(filters[k]))) print ("\n------ processing '%s' using self.adjustment_state['cmda_bspe'], filter= %s"%(k,str(filters[k])))
try: try:
...@@ -727,14 +756,68 @@ class X393McntrlAdjust(object): ...@@ -727,14 +756,68 @@ class X393McntrlAdjust(object):
quiet = quiet+2) quiet = quiet+2)
except: except:
pass pass
delays[k]=self.get_delays_for_phase(phase = phase, else:
list_branches=False, # just get one set of filtered delay delays[k]=self.get_delays_for_phase(phase = phase,
target= k, list_branches=False, # just get one set of filtered delay
b_filter= filters[k], target= k,
cost= cost, b_filter= filters[k],
quiet = quiet+2) cost= cost,
quiet = quiet+2)
if delays[k] is None: if delays[k] is None:
return None if quiet < 3:
print ("delays[%s]=%s,phaseTolerances=%s"%(k,str(delays[k]),str(phaseTolerances)))
if phaseTolerances:
all_good=False
else:
if quiet < 3:
print ("%s: return None"%(k))
return None
if not all_good: # try to fix - see if the solutions exist for slightly different phases
if quiet < 3:
print ("phase= %d, delays= %s"%(phase,str(delays)))
for pair in ((CMDA_KEY,CMDA_KEY,),(DQSI_KEY,DQI_KEY),(DQSO_KEY,DQO_KEY)): # will do some double work for CMDA_KEY
if (pair[0] in phaseTolerances) and phaseTolerances[pair[0]] and (pair[0] in delays) and (pair[1] in delays): # so not to process forgive_missing again
if quiet < 3:
print ("pair= ",pair)
if (not (delays[pair[0]]) is None) and (not (delays[pair[1]]) is None):
continue #nothing to fix for this pair
phase_var=1
while abs(phase_var) <= phaseTolerances[pair[0]]:
other_phase=(phase+phase_var) % numPhaseSteps
if quiet < 2:
print ("phase_var=%d, other_phase=%d"%(phase_var,other_phase))
dlys=[]
dlys.append(self.get_delays_for_phase(phase = other_phase,
list_branches=False, # just get one set of filtered delay
target= pair[0],
b_filter= filters[pair[0]],
cost= cost,
quiet = quiet+2))
dlys.append(self.get_delays_for_phase(phase = other_phase,
list_branches=False, # just get one set of filtered delay
target= pair[1],
b_filter= filters[pair[1]],
cost= cost,
quiet = quiet+2))
if quiet < 2:
print ("dlys=",dlys)
if not None in dlys:
if quiet <3:
print ("Found replacement phase=%d (for %d) for the signal pair:%s"%(other_phase,phase,str(pair)))
delays[pair[0]]=dlys[0]
delays[pair[1]]=dlys[1]
break
phase_var=-phase_var
if phase_var > 0:
phase_var += +1
# See if there are still some None in the delays
if None in delays:
if quiet <2:
print ("Some delays are still missing for phase %d :%s"%(phase,str(delays)))
return delays return delays
def show_all_delays(self, def show_all_delays(self,
...@@ -792,16 +875,22 @@ class X393McntrlAdjust(object): ...@@ -792,16 +875,22 @@ class X393McntrlAdjust(object):
periods_phase={} periods_phase={}
periods_all={} periods_all={}
for k in SIG_LIST: for k in SIG_LIST:
if quiet < 2: if not filters[k] is None:
print ("\n===== processing '%s', filter= %s"%(k,str(filters[k]))) if quiet < 2:
periods_phase[k]=self.get_delays_for_phase(phase = None, print ("\n===== processing '%s', filter= %s"%(k,str(filters[k])))
list_branches=True, periods_phase[k]=self.get_delays_for_phase(phase = None,
target=k, list_branches=True,
b_filter=filters[k], target=k,
#cost=NUM_FINE_STEPS, b_filter=filters[k],
quiet = quiet+1) #cost=NUM_FINE_STEPS,
# quiet = quiet+0) quiet = quiet+1)
numPhases=len(periods_phase[CMDA_KEY]) # quiet = quiet+0)
# numPhases=len(periods_phase[CMDA_KEY])
try:
numPhases=len(periods_phase[periods_phase.keys()[0]])
except:
print ("show_all_delays(): Nothing selected, exiting")
return
#Remove DQI and DQO branches that are referenced to non-existing (filtered out) DQSI/DQI #Remove DQI and DQO branches that are referenced to non-existing (filtered out) DQSI/DQI
for phase in range (numPhases):# ,cmda,dqso,dqo, in zip(range(numPhases),cmda_vars,dqso_vars,dqo_vars): for phase in range (numPhases):# ,cmda,dqso,dqo, in zip(range(numPhases),cmda_vars,dqso_vars,dqo_vars):
if (DQI_KEY in periods_phase) and (DQSI_KEY in periods_phase): if (DQI_KEY in periods_phase) and (DQSI_KEY in periods_phase):
...@@ -894,15 +983,16 @@ class X393McntrlAdjust(object): ...@@ -894,15 +983,16 @@ class X393McntrlAdjust(object):
print ("%s"%(periods_phase[k][phase]), end=" ") print ("%s"%(periods_phase[k][phase]), end=" ")
print() print()
for k in SIG_LIST: for k in SIG_LIST:
periods_all[k]=set() if k in periods_phase:
for lp in periods_phase[k]: periods_all[k]=set()
try: for lp in periods_phase[k]:
for p in lp: try:
periods_all[k].add(p) for p in lp:
except: periods_all[k].add(p)
pass # None except:
periods_all[k]=list(periods_all[k]) pass # None
periods_all[k].sort() periods_all[k]=list(periods_all[k])
periods_all[k].sort()
if quiet <3: if quiet <3:
print ("periods_all=",periods_all) print ("periods_all=",periods_all)
# Print the header # Print the header
...@@ -914,71 +1004,81 @@ class X393McntrlAdjust(object): ...@@ -914,71 +1004,81 @@ class X393McntrlAdjust(object):
positions={CMDA_KEY:num_cmda,DQSI_KEY:num_lanes,DQI_KEY:num_lines,DQSO_KEY:num_lanes,DQO_KEY:num_lines} positions={CMDA_KEY:num_cmda,DQSI_KEY:num_lanes,DQI_KEY:num_lines,DQSO_KEY:num_lanes,DQO_KEY:num_lines}
print ("phase",end=" ") print ("phase",end=" ")
for period in periods_all[CMDA_KEY]: if CMDA_KEY in periods_all:
for i in range(num_addr): for period in periods_all[CMDA_KEY]:
print("A%d_%d"%(i,period),end=" ") for i in range(num_addr):
for i in range(num_banks): print("A%d_%d"%(i,period),end=" ")
print("BA%d_%d"%(i,period),end=" ") for i in range(num_banks):
print ("WE_%d RAS_%d CAS_%d AVG_%d"%(period,period,period,period), end=" ") # AVG - average for address, banks, RCW print("BA%d_%d"%(i,period),end=" ")
for period in periods_all[DQSI_KEY]: print ("WE_%d RAS_%d CAS_%d AVG_%d"%(period,period,period,period), end=" ") # AVG - average for address, banks, RCW
for lane in range(num_lanes): if DQSI_KEY in periods_all:
print("DQSI_%d_%d"%(lane,period),end=" ") for period in periods_all[DQSI_KEY]:
for period in periods_all[DQI_KEY]: for lane in range(num_lanes):
for line in range(num_lines): print("DQSI_%d_%d"%(lane,period),end=" ")
print("DQI_%d_%d/%d"%(line,period[0],period[1]),end=" ") if DQI_KEY in periods_all:
for period in periods_all[DQSO_KEY]: for period in periods_all[DQI_KEY]:
for lane in range(num_lanes): for line in range(num_lines):
print("DQSO_%d_%d"%(lane,period),end=" ") print("DQI_%d_%d/%d"%(line,period[0],period[1]),end=" ")
for period in periods_all[DQO_KEY]: if DQSO_KEY in periods_all:
for line in range(num_lines): for period in periods_all[DQSO_KEY]:
print("DQO_%d_%d/%d"%(line,period[0],period[1]),end=" ") for lane in range(num_lanes):
print("DQSO_%d_%d"%(lane,period),end=" ")
if DQO_KEY in periods_all:
for period in periods_all[DQO_KEY]:
for line in range(num_lines):
print("DQO_%d_%d/%d"%(line,period[0],period[1]),end=" ")
#TODO - add errors print #TODO - add errors print
# """ # """
for period in periods_all[CMDA_KEY]: if CMDA_KEY in periods_all:
print("ERR_CMDA_%d"%(period),end=" ") for period in periods_all[CMDA_KEY]:
for period in periods_all[DQSI_KEY]: print("ERR_CMDA_%d"%(period),end=" ")
print("ERR_DQSI_%d"%(period),end=" ") if DQSI_KEY in periods_all:
for period in periods_all[DQSO_KEY]: for period in periods_all[DQSI_KEY]:
print("ERR_DQSO_%d"%(period),end=" ") print("ERR_DQSI_%d"%(period),end=" ")
if DQSO_KEY in periods_all:
for period in periods_all[DQSO_KEY]:
print("ERR_DQSO_%d"%(period),end=" ")
# """ # """
print() print()
#print body #print body
for phase in range(numPhases): for phase in range(numPhases):
print ("%d"%(phase),end=" ") print ("%d"%(phase),end=" ")
for k in SIG_LIST: for k in SIG_LIST:
for period in periods_all[k]: if k in periods_all:
if (not periods_phase[k][phase] is None) and (period in periods_phase[k][phase]): for period in periods_all[k]:
# print("<<",k,"::",periods_phase[k][phase],":",period,">>>") if (not periods_phase[k][phase] is None) and (period in periods_phase[k][phase]):
data_group=self.get_delays_for_phase(phase = phase, # print("<<",k,"::",periods_phase[k][phase],":",period,">>>")
list_branches=False, data_group=self.get_delays_for_phase(phase = phase,
target=k, list_branches=False,
b_filter=[period,"A"], target=k,
#cost=NUM_FINE_STEPS, only used with 'B' b_filter=[period,"A"],
quiet = quiet+2) #cost=NUM_FINE_STEPS, only used with 'B'
else: quiet = quiet+2)
data_group=None else:
for i in range(positions[k]): data_group=None
for i in range(positions[k]):
try:
print("%d"%(data_group[i]), end=" ")
except:
print("?",end=" ")
for k in [CMDA_KEY,DQSI_KEY,DQSO_KEY]:
if k in periods_all:
for period in periods_all[k]:
if (not periods_phase[k][phase] is None) and (period in periods_phase[k][phase]):
err_ps=self.get_delays_for_phase(phase = phase,
list_branches='Err',
target=k,
b_filter=[period,"A"],
#cost=NUM_FINE_STEPS, only used with 'B'
quiet = quiet+2)
else:
err_ps=None
try: try:
print("%d"%(data_group[i]), end=" ") print("%.1f"%(err_ps/tSDQS), end=" ")
except: except:
print("?",end=" ") print("?",end=" ")
for k in [CMDA_KEY,DQSI_KEY,DQSO_KEY]:
for period in periods_all[k]:
if (not periods_phase[k][phase] is None) and (period in periods_phase[k][phase]):
err_ps=self.get_delays_for_phase(phase = phase,
list_branches='Err',
target=k,
b_filter=[period,"A"],
#cost=NUM_FINE_STEPS, only used with 'B'
quiet = quiet+2)
else:
err_ps=None
try:
print("%.1f"%(err_ps/tSDQS), end=" ")
except:
print("?",end=" ")
print() print()
...@@ -2286,7 +2386,7 @@ class X393McntrlAdjust(object): ...@@ -2286,7 +2386,7 @@ class X393McntrlAdjust(object):
print ("timing)=%s, dly_step=%d step180=%d"%(str(timing),dly_step,step180)) print ("timing)=%s, dly_step=%d step180=%d"%(str(timing),dly_step,step180))
self.x393_pio_sequences.set_read_block(*(brc+(nrep+3,sel))) # set sequence once self.x393_pio_sequences.set_read_block(*(brc+(nrep+3,sel))) # set sequence once
#prepare writing block: #prepare writing block:
wdata16=(0,0,0xffff,0xffff)*(2*(nrep+3)) # Data will have o/1 transitions in every bit, even if DQ_OPDELAY to DQS_OPDELAY is not yet adjusted wdata16=(0,0,0xffff,0xffff)*(2*(nrep+3)) # Data will have o/1 transitions in every bit, even if DQ_ODELAY to DQS_ODELAY is not yet adjusted
wdata32=convert_mem16_to_w32(wdata16) wdata32=convert_mem16_to_w32(wdata16)
self.x393_mcntrl_buffers.write_block_buf_chn(0,0,wdata32,quiet) # fill block memory (channel, page, number) self.x393_mcntrl_buffers.write_block_buf_chn(0,0,wdata32,quiet) # fill block memory (channel, page, number)
self.x393_pio_sequences.set_write_block(*(brc+(nrep+3,0,sel))) # set sequence once self.x393_pio_sequences.set_write_block(*(brc+(nrep+3,0,sel))) # set sequence once
...@@ -3087,7 +3187,8 @@ class X393McntrlAdjust(object): ...@@ -3087,7 +3187,8 @@ class X393McntrlAdjust(object):
self.adjustment_state.update(rdict) self.adjustment_state.update(rdict)
def measure_addr_odelay(self, def measure_addr_odelay(self,
safe_phase=0.25, # 0 strictly follow cmda_odelay, >0 -program with this fraction of clk period from the margin safe_phase=0.25, # 0 strictly follow cmda_odelay, >0 -program with this fraction of clk period from the margin
dqsi_safe_phase=0.125, # > 0 - allow DQSI with DQI simultaneously deviate +/- this fraction of a period
ra = 0, ra = 0,
ba = 0, ba = 0,
quiet=1, quiet=1,
...@@ -3104,23 +3205,24 @@ class X393McntrlAdjust(object): ...@@ -3104,23 +3205,24 @@ class X393McntrlAdjust(object):
be read. Address and bank lines are tested with different delays, one bit at a time. be read. Address and bank lines are tested with different delays, one bit at a time.
""" """
# self.load_hardcoded_data() # TODO: TEMPORARY - remove later # self.load_hardcoded_data() # TODO: TEMPORARY - remove later
try: try:
self.x393_mcntrl_timing.axi_set_dqs_dqm_patterns(dqs_patt=self.adjustment_state["dqs_pattern"], self.x393_mcntrl_timing.axi_set_dqs_dqm_patterns(dqs_patt=self.adjustment_state["dqs_pattern"],
dqm_patt=None, dqm_patt=None,
quiet=quiet+2) quiet=quiet+2)
except: except:
print("Skipping DQS pattern (0x55/0xaa) control as it is not in gloabal data (dqs_patt=self.adjustment_state['dqs_pattern'])") print("Skipping DQS pattern (0x55/0xaa) control as it is not in gloabal data (dqs_patt=self.adjustment_state['dqs_pattern'])")
num_ba=3 num_ba=3
if not single: if not single:
pass1=self.measure_addr_odelay(safe_phase=safe_phase, #0.25, # 0 strictly follow cmda_odelay, >0 -program with this fraction of clk period from the margin pass1=self.measure_addr_odelay(safe_phase=safe_phase, #0.25, # 0 strictly follow cmda_odelay, >0 -program with this fraction of clk period from the margin
dqsi_safe_phase=dqsi_safe_phase,
ra = ra, # 0, ra = ra, # 0,
ba = ba, # 0, ba = ba, # 0,
quiet=quiet+1, #1, quiet=quiet+1, #1,
single=True) # single=False) single=True) # single=False)
pass2=self.measure_addr_odelay(safe_phase=safe_phase, #0.25, # 0 strictly follow cmda_odelay, >0 -program with this fraction of clk period from the margin pass2=self.measure_addr_odelay(safe_phase=safe_phase, #0.25, # 0 strictly follow cmda_odelay, >0 -program with this fraction of clk period from the margin
dqsi_safe_phase=dqsi_safe_phase,
ra = ra ^ ((1 << vrlg.ADDRESS_NUMBER)-1), # 0, ra = ra ^ ((1 << vrlg.ADDRESS_NUMBER)-1), # 0,
ba = ba ^ ((1 << num_ba)-1), # 0, ba = ba ^ ((1 << num_ba)-1), # 0,
quiet=quiet+1, #1, quiet=quiet+1, #1,
...@@ -3131,9 +3233,40 @@ class X393McntrlAdjust(object): ...@@ -3131,9 +3233,40 @@ class X393McntrlAdjust(object):
for p in [pass1,pass2]: for p in [pass1,pass2]:
print(p,",") print(p,",")
print(']') print(']')
if (quiet<4):
num_addr=vrlg.ADDRESS_NUMBER
num_banks=3
print ("\n measured marginal addresses and bank adresses for each phase")
print ("phase", end=" ")
for edge in ("\\_","_/"):
for i in range (num_addr):
print("A%d%s"%(i,edge),end=" ")
for i in range (num_banks):
print("BA%d%s"%(i,edge),end=" ")
print()
for phase in range (len(pass1)):
print ("%d"%(phase), end=" ")
for p in pass1,pass2:
for i in range (num_addr+num_banks):
try:
print ("%d"%(p[phase][i]),end=" ")
except:
print ("?", end=" ")
print()
return [pass1,pass2] return [pass1,pass2]
dly_steps=self.x393_mcntrl_timing.get_dly_steps()
numPhaseSteps= int(dly_steps['SDCLK_PERIOD']/dly_steps['PHASE_STEP']+0.5)
if dqsi_safe_phase:
dqsi_safe_phase*=1000*dly_steps['SDCLK_PERIOD']
if quiet<3:
print("Using dqsi_safe_phase=%f ps"%(dqsi_safe_phase))
maxPhaseErrorsPS=(None,dqsi_safe_phase,None)
else:
maxPhaseErrorsPS=None
nbursts=1 # just 1 full burst for block comparison(will write nbursts+3) nbursts=1 # just 1 full burst for block comparison(will write nbursts+3)
sel_wr=1 sel_wr=1
sel_rd=1 sel_rd=1
...@@ -3143,8 +3276,6 @@ class X393McntrlAdjust(object): ...@@ -3143,8 +3276,6 @@ class X393McntrlAdjust(object):
inv_ba=ba ^ ((1 << num_ba)-1) inv_ba=ba ^ ((1 << num_ba)-1)
if not "cmda_bspe" in self.adjustment_state: if not "cmda_bspe" in self.adjustment_state:
raise Exception ("No cmda_odelay data is available. 'adjust_cmda_odelay 0 1 0.1 3' command should run first.") raise Exception ("No cmda_odelay data is available. 'adjust_cmda_odelay 0 1 0.1 3' command should run first.")
dly_steps=self.x393_mcntrl_timing.get_dly_steps()
numPhaseSteps= int(dly_steps['SDCLK_PERIOD']/dly_steps['PHASE_STEP']+0.5)
#create a list of None/optimal cmda determined earlier #create a list of None/optimal cmda determined earlier
cmda_odly= [None if (self.adjustment_state['cmda_bspe'][phase] is None) else self.adjustment_state['cmda_bspe'][phase]['ldly'] for phase in range(numPhaseSteps)] cmda_odly= [None if (self.adjustment_state['cmda_bspe'][phase] is None) else self.adjustment_state['cmda_bspe'][phase]['ldly'] for phase in range(numPhaseSteps)]
...@@ -3181,6 +3312,7 @@ class X393McntrlAdjust(object): ...@@ -3181,6 +3312,7 @@ class X393McntrlAdjust(object):
filter_dqo= DFLT_DLY_FILT, #None, filter_dqo= DFLT_DLY_FILT, #None,
cost= None, cost= None,
forgive_missing=False, forgive_missing=False,
maxPhaseErrorsPS = maxPhaseErrorsPS, #CMDA, DQSI, DQSO
quiet= quiet) quiet= quiet)
if not ph_dlys is None: if not ph_dlys is None:
break break
...@@ -3198,6 +3330,8 @@ class X393McntrlAdjust(object): ...@@ -3198,6 +3330,8 @@ class X393McntrlAdjust(object):
inv_ba, inv_ba,
0) # verbose=0 0) # verbose=0
# set usable timing, enable refresh # set usable timing, enable refresh
if quiet <3 :
print ("+++ dqsi_safe_phase=",dqsi_safe_phase)
used_delays=self.set_delays(phase=phase, used_delays=self.set_delays(phase=phase,
filter_cmda=DFLT_DLY_FILT, # may be special case: 'S<safe_phase_as_float_number> filter_cmda=DFLT_DLY_FILT, # may be special case: 'S<safe_phase_as_float_number>
filter_dqsi=DFLT_DLY_FILT, filter_dqsi=DFLT_DLY_FILT,
...@@ -3207,6 +3341,7 @@ class X393McntrlAdjust(object): ...@@ -3207,6 +3341,7 @@ class X393McntrlAdjust(object):
cost=None, cost=None,
refresh=True, refresh=True,
forgive_missing=True, forgive_missing=True,
maxPhaseErrorsPS=maxPhaseErrorsPS,
quiet=quiet) quiet=quiet)
if used_delays is None: if used_delays is None:
raise Exception("measure_addr_odelay(): failed to set phase = %d"%(phase)) # raise Exception("measure_addr_odelay(): failed to set phase = %d"%(phase)) #
...@@ -3293,6 +3428,7 @@ class X393McntrlAdjust(object): ...@@ -3293,6 +3428,7 @@ class X393McntrlAdjust(object):
# after write is done # after write is done
if quiet < 2: if quiet < 2:
print ("****** phase=%d ******"%(phase),end=" ") print ("****** phase=%d ******"%(phase),end=" ")
# Remove try/except to troubleshoot newly introduced bugs
try: try:
ph_dlys= self.get_all_delays(phase=phase, ph_dlys= self.get_all_delays(phase=phase,
filter_cmda= DFLT_DLY_FILT, # may be special case: 'S<safe_phase_as_float_number> filter_cmda= DFLT_DLY_FILT, # may be special case: 'S<safe_phase_as_float_number>
...@@ -3302,12 +3438,13 @@ class X393McntrlAdjust(object): ...@@ -3302,12 +3438,13 @@ class X393McntrlAdjust(object):
filter_dqo= None, filter_dqo= None,
cost= None, cost= None,
forgive_missing=False, forgive_missing=False,
maxPhaseErrorsPS = maxPhaseErrorsPS,
quiet= quiet) quiet= quiet)
if ph_dlys is None: if ph_dlys is None:
if quiet < 1: if quiet < 1:
print ("get_all_delays(%d,...) is None"%(phase)) print ("get_all_delays(%d,...) is None"%(phase))
return None return None
except: except:
print ("********** Failed get_all_delays(%d,...) is None"%(phase)) print ("********** Failed get_all_delays(%d,...) is None"%(phase))
return None return None
...@@ -3354,6 +3491,7 @@ class X393McntrlAdjust(object): ...@@ -3354,6 +3491,7 @@ class X393McntrlAdjust(object):
cost=None, cost=None,
refresh=True, refresh=True,
forgive_missing=True, forgive_missing=True,
maxPhaseErrorsPS=maxPhaseErrorsPS,
quiet=quiet) quiet=quiet)
if used_delays is None: if used_delays is None:
raise Exception("measure_addr_odelay(): failed to set phase = %d"%(phase)) raise Exception("measure_addr_odelay(): failed to set phase = %d"%(phase))
...@@ -3766,9 +3904,10 @@ class X393McntrlAdjust(object): ...@@ -3766,9 +3904,10 @@ class X393McntrlAdjust(object):
print () print ()
self.adjustment_state['cmd_meas']=cmd_odelay self.adjustment_state['cmd_meas']=cmd_odelay
if quiet < 3: if quiet < 3:
print ("phase cmda cmda_early WE RAS CAS")
for phase, cdly in enumerate(cmd_odelay): for phase, cdly in enumerate(cmd_odelay):
print("%d"%(phase),end=" ") print("%d"%(phase),end=" ")
print("%s"%(str(cmda_odly[phase])),end=" ") print("%s %s"%(str(cmda_odly[phase]),str(cmda_odly_early[phase])),end=" ")
if cdly: if cdly:
for b in cdly: for b in cdly:
if not b is None: if not b is None:
...@@ -4049,6 +4188,7 @@ class X393McntrlAdjust(object): ...@@ -4049,6 +4188,7 @@ class X393McntrlAdjust(object):
filter_dqo= DFLT_DLY_FILT, filter_dqo= DFLT_DLY_FILT,
forgive_missing=False, forgive_missing=False,
cost=None, cost=None,
maxPhaseErrorsPS = None,
quiet=quiet+2) quiet=quiet+2)
for phase, v in enumerate(write_valid): for phase, v in enumerate(write_valid):
if not v is None: if not v is None:
...@@ -4063,7 +4203,8 @@ class X393McntrlAdjust(object): ...@@ -4063,7 +4203,8 @@ class X393McntrlAdjust(object):
filter_dqo= DFLT_DLY_FILT, filter_dqo= DFLT_DLY_FILT,
cost=None, cost=None,
refresh=True, refresh=True,
forgive_missing=False, forgive_missing = False,
maxPhaseErrorsPS = None,
quiet=quiet+2) quiet=quiet+2)
if used_delay is None: if used_delay is None:
raise Exception("Failed to set delay for writing block") raise Exception("Failed to set delay for writing block")
...@@ -4086,7 +4227,9 @@ class X393McntrlAdjust(object): ...@@ -4086,7 +4227,9 @@ class X393McntrlAdjust(object):
filter_dqo= None, filter_dqo= None,
cost=None, cost=None,
refresh=True, refresh=True,
forgive_missing=False, forgive_missing = False,
maxPhaseErrorsPS = None,
# quiet=quiet+1) # quiet=quiet+1)
quiet=quiet+1) quiet=quiet+1)
if used_delays is None: if used_delays is None:
...@@ -4481,9 +4624,10 @@ write_settings= { ...@@ -4481,9 +4624,10 @@ write_settings= {
cost = None, cost = None,
refresh = True, refresh = True,
forgive_missing = False, forgive_missing = False,
maxPhaseErrorsPS= None,
quiet=quiet+2) quiet=quiet+2)
if used_delays is None: if used_delays is None:
raise Exception("measure_addr_odelay(): failed to set phase = %d"%(phase)) raise Exception("set_write_branch(): failed to set phase = %d"%(phase))
self.x393_pio_sequences.write_block_inc(num8=num8, # max 512 16-bit words self.x393_pio_sequences.write_block_inc(num8=num8, # max 512 16-bit words
...@@ -4506,6 +4650,7 @@ write_settings= { ...@@ -4506,6 +4650,7 @@ write_settings= {
cost = None, cost = None,
refresh = True, refresh = True,
forgive_missing = False, forgive_missing = False,
maxPhaseErrorsPS= None,
quiet=quiet+2) quiet=quiet+2)
if used_delays is None: if used_delays is None:
raise Exception("set_write_branch(): failed to set phase = %d"%(phase)) raise Exception("set_write_branch(): failed to set phase = %d"%(phase))
...@@ -4679,7 +4824,7 @@ write_settings= { ...@@ -4679,7 +4824,7 @@ write_settings= {
# print ("**** REMOVE THIS RETURN ****") # print ("**** REMOVE THIS RETURN ****")
# return # return
#When setting optimal phase - see if center is in other period, modify other parameters accordingly
rslt=[] rslt=[]
for k,v in varints_map.items(): for k,v in varints_map.items():
...@@ -4728,12 +4873,14 @@ write_settings= { ...@@ -4728,12 +4873,14 @@ write_settings= {
cost = None, cost = None,
refresh = True, refresh = True,
forgive_missing = False, forgive_missing = False,
maxPhaseErrorsPS= None,
quiet = quiet+1) quiet = quiet+1)
if used_delays is None: if used_delays is None:
print ("sorted result=",rslt) print ("sorted result=",rslt)
raise Exception("get_phase_range(): failed to set phase = %d"%(optimal['phase'])) # raise Exception("get_phase_range(): failed to set phase = %d"%(optimal['phase'])) #
if quiet < 4: if quiet < 3:
print ("Remaining ranges:")
self.show_all_delays(filter_variants = varints_map.keys(), self.show_all_delays(filter_variants = varints_map.keys(),
filter_cmda = filters[CMDA_KEY], filter_cmda = filters[CMDA_KEY],
filter_dqsi = filters[DQSI_KEY], filter_dqsi = filters[DQSI_KEY],
...@@ -4741,6 +4888,15 @@ write_settings= { ...@@ -4741,6 +4888,15 @@ write_settings= {
filter_dqso = filters[DQSO_KEY], filter_dqso = filters[DQSO_KEY],
filter_dqo = filters[DQO_KEY], filter_dqo = filters[DQO_KEY],
quiet = quiet+0) quiet = quiet+0)
if quiet < 4:
print ("Best Range:")
self.show_all_delays(filter_variants = [(optimal['cmda'],optimal['dqo'],optimal['dqi'])],
filter_cmda = filters[CMDA_KEY],
filter_dqsi = filters[DQSI_KEY],
filter_dqi = filters[DQI_KEY],
filter_dqso = filters[DQSO_KEY],
filter_dqo = filters[DQO_KEY],
quiet = quiet+0)
return rslt # first in the list is the best return rslt # first in the list is the best
...@@ -4762,6 +4918,10 @@ write_settings= { ...@@ -4762,6 +4918,10 @@ write_settings= {
for variant in adj_vars: for variant in adj_vars:
if quiet < 2: if quiet < 2:
print ("Testing variant %s to write and read data"%(variant)) print ("Testing variant %s to write and read data"%(variant))
start_phase=variant['']
dlys= self.get_all_delays(phase=None, dlys= self.get_all_delays(phase=None,
filter_cmda = [variant[CMDA_KEY]], filter_cmda = [variant[CMDA_KEY]],
filter_dqsi = [variant[DQSI_KEY]], filter_dqsi = [variant[DQSI_KEY]],
...@@ -4770,6 +4930,7 @@ write_settings= { ...@@ -4770,6 +4930,7 @@ write_settings= {
filter_dqo = [variant[DQO_KEY]], filter_dqo = [variant[DQO_KEY]],
forgive_missing = False, forgive_missing = False,
cost = None, cost = None,
maxPhaseErrorsPS = None,
quiet = quiet+2) quiet = quiet+2)
if quiet < 2: if quiet < 2:
for phase, d in enumerate(dlys): for phase, d in enumerate(dlys):
...@@ -4826,6 +4987,7 @@ write_settings= { ...@@ -4826,6 +4987,7 @@ write_settings= {
# primary_set_out=2 # primary_set_out=2
write_sel=1 # set DDR3 command in the second cycle of two (0 - during the first omne) write_sel=1 # set DDR3 command in the second cycle of two (0 - during the first omne)
safe_phase=0.25 # 0: strictly follow cmda_odelay, >0 -program with this fraction of clk period from the margin safe_phase=0.25 # 0: strictly follow cmda_odelay, >0 -program with this fraction of clk period from the margin
measure_addr_odelay_dqsi_safe_phase=0.125 # > 0 - allow DQSI with DQI simultaneously deviate +/- this fraction of a period
commonFine=True, # use same values for fine delay for address/bank lines commonFine=True, # use same values for fine delay for address/bank lines
DqsiMaxDlyErr=200.0 # currently just to check multiple overlapping DQSI branches DqsiMaxDlyErr=200.0 # currently just to check multiple overlapping DQSI branches
DqsoMaxDlyErr=200.0 # currently just to check multiple overlapping DQSI branches DqsoMaxDlyErr=200.0 # currently just to check multiple overlapping DQSI branches
...@@ -4948,6 +5110,7 @@ write_settings= { ...@@ -4948,6 +5110,7 @@ write_settings= {
'func':self.measure_addr_odelay, 'func':self.measure_addr_odelay,
'comment':'Measuring address and bank lines output delays', 'comment':'Measuring address and bank lines output delays',
'params':{'safe_phase':safe_phase, 'params':{'safe_phase':safe_phase,
'dqsi_safe_phase':measure_addr_odelay_dqsi_safe_phase,
'ra': 0, 'ra': 0,
'ba': 0, 'ba': 0,
'quiet':quiet+1}}, 'quiet':quiet+1}},
...@@ -4995,23 +5158,23 @@ write_settings= { ...@@ -4995,23 +5158,23 @@ write_settings= {
'func':self.show_all_delays, 'func':self.show_all_delays,
'comment':'Printing results table (delays and errors vs. phase)- all, including invalid phases', 'comment':'Printing results table (delays and errors vs. phase)- all, including invalid phases',
'params':{'filter_variants':None, # Here any string 'params':{'filter_variants':None, # Here any string
'filter_cmda': None, 'filter_cmda': 'A',
'filter_dqsi': None, 'filter_dqsi': 'A',
'filter_dqi': None, 'filter_dqi': 'A',
'filter_dqso': None, 'filter_dqso': 'A',
'filter_dqo': None, 'filter_dqo': 'A',
'quiet': quiet+1}}, 'quiet': quiet+1}},
{'key':'Z', {'key':'Z',
'func':self.show_all_delays, 'func':self.show_all_delays,
'comment':'Printing results table (delays and errors vs. phase)- Only phases that nave valid values for all signals', 'comment':'Printing results table (delays and errors vs. phase)- Only phases that nave valid values for all signals',
'params':{'filter_variants':'A', # Here any string 'params':{'filter_variants':'A', # Here any string
'filter_cmda': None, 'filter_cmda': 'A',
'filter_dqsi': None, 'filter_dqsi': 'A',
'filter_dqi': None, 'filter_dqi': 'A',
'filter_dqso': None, 'filter_dqso': 'A',
'filter_dqo': None, 'filter_dqo': 'A',
'quiet': quiet+1}}, 'quiet': quiet+1}},
] ]
start_time=time.time() start_time=time.time()
...@@ -5222,6 +5385,21 @@ write_settings= { ...@@ -5222,6 +5385,21 @@ write_settings= {
dqs_phase[k.replace('dqs_','dqsi_')]=dqs_phase.pop(k) dqs_phase[k.replace('dqs_','dqsi_')]=dqs_phase.pop(k)
if quiet < 3: if quiet < 3:
print ("dqsi_phase=",dqs_phase) print ("dqsi_phase=",dqs_phase)
numLanes= len(dqs_phase)
numPhases=len(dqs_phase[0])
print ("\nphase", end=" ")
for lane in range (numLanes):
print("dqsi%d"%(lane),end=" ")
print()
for phase in range (numPhases):
print ("%d"%(phase),end=" ")
for lane in range (numLanes):
try:
print("%d"%(dqs_phase[lane][phase]),end=" ")
except:
print("?")
print
self.adjustment_state.update(dqs_phase) self.adjustment_state.update(dqs_phase)
#combine DQSI and DQI data to get DQ vs. phase #combine DQSI and DQI data to get DQ vs. phase
...@@ -5318,6 +5496,8 @@ write_settings= { ...@@ -5318,6 +5496,8 @@ write_settings= {
dqs_phase[k.replace('dqs_','dqso_')]=dqs_phase.pop(k) dqs_phase[k.replace('dqs_','dqso_')]=dqs_phase.pop(k)
if quiet < 3: if quiet < 3:
print ("dqso_phase=",dqs_phase) print ("dqso_phase=",dqs_phase)
self.adjustment_state.update(dqs_phase) self.adjustment_state.update(dqs_phase)
#combine DQSO and DQO data to get DQO vs. phase #combine DQSO and DQO data to get DQO vs. phase
if not dqso_dqo_parameters is None: if not dqso_dqo_parameters is None:
......
py393/x393_utils.py
View file @ 8729da71
...@@ -198,7 +198,11 @@ class X393Utils(object): ...@@ -198,7 +198,11 @@ class X393Utils(object):
{"name":"DLY_LANE1_ODELAY", "width": 80, "decl_width":""}, {"name":"DLY_LANE1_ODELAY", "width": 80, "decl_width":""},
{"name":"DLY_LANE1_IDELAY", "width": 72, "decl_width":""}, {"name":"DLY_LANE1_IDELAY", "width": 72, "decl_width":""},
{"name":"DLY_CMDA", "width":256, "decl_width":""}, {"name":"DLY_CMDA", "width":256, "decl_width":""},
{"name":"DLY_PHASE", "width": 8, "decl_width":""}) {"name":"DLY_PHASE", "width": 8, "decl_width":""},
{"name":"DFLT_WBUF_DELAY", "width": 4, "decl_width":""},
{"name":"DFLT_WSEL", "width": 1, "decl_width":""},
{"name":"DFLT_RSEL", "width": 1, "decl_width":""},
)
def localparams(self, def localparams(self,
quiet=False): quiet=False):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment