next snapshot, implemented more expression types in parameter parsing

py393/test1.py

@@ -45,6 +45,7 @@ from import_verilog_parameters import VerilogParameters
 import x393_mem
 import x393_axi_control_status
 import x393_pio_sequences
+import x393_mcntrl_timing
 __all__ = []
 __version__ = 0.1
 __date__ = '2015-03-01'
@@ -90,7 +91,8 @@ def execTask(commandLine):
             funcArgs[i]=eval(arg) # Try parsing parameters as numbers, if possible
         except:
             pass
-#    result = callableTasks[funcName]['func'](callableTasks[funcName]['inst'],*funcArgs)
+    result = callableTasks[funcName]['func'](callableTasks[funcName]['inst'],*funcArgs)
+    '''
     try:
         result = callableTasks[funcName]['func'](callableTasks[funcName]['inst'],*funcArgs)
     except Exception as e:
@@ -107,6 +109,7 @@ def execTask(commandLine):
             sFuncArgs+=' <'+str(a)+'>'
         print ("Usage:\n%s %s"%(funcName,sFuncArgs))
         print ("exception message:"+str(e))
+    '''
     return result
 def hx(obj):
     try:
@@ -224,8 +227,9 @@ USAGE
     if verbose > 3: print("vpars1.VERBOSE__RAW="+str(vpars1.VERBOSE__RAW))
     
     x393mem=    x393_mem.X393Mem(verbose,True) #add dry run parameter
-    x393tasks=x393_axi_control_status.X393AxiControlStatus(verbose,True)
+    x393tasks=  x393_axi_control_status.X393AxiControlStatus(verbose,True)
     x393Pio=    x393_pio_sequences.X393PIOSequences(verbose,True)
+    x393Timing= x393_mcntrl_timing.X393McntrlTiming(verbose,True)
     '''
     print ("----------------------")
     print("x393_mem.__dict__="+str(x393_mem.__dict__))
@@ -243,12 +247,13 @@ USAGE
     extractTasks(x393_mem.X393Mem,x393mem)
     extractTasks(x393_axi_control_status.X393AxiControlStatus,x393tasks)
     extractTasks(x393_pio_sequences.X393PIOSequences,x393Pio)
+    extractTasks(x393_mcntrl_timing.X393McntrlTiming,x393Timing)
 
     if verbose > 3:     
         funcName="read_mem"
         funcArgs=[0x377,123]
         print ('==== testing function : '+funcName+str(funcArgs)+' ====')
-#execTask(commandLine)    
+#        execTask(commandLine) 
         try:
             callableTasks[funcName]['func'](callableTasks[funcName]['inst'],*funcArgs)
         except Exception as e:
@@ -291,16 +296,27 @@ USAGE
                 print ('\n"parameters" and "defines" list known defined parameters and macros')
             elif line == 'parameters':
                 parameters=ivp.getParameters()
+                for par,val in sorted(parameters.items()):
+                    try:
+                        print (par+" = "+hex(val[0])+" (type = "+val[1]+" raw = "+val[2]+")")        
+                    except:
+                        print (par+" = "+str(val[0])+" (type = "+val[1]+" raw = "+val[2]+")")
+                
+                '''
                 for par in parameters:
                     try:
                         print (par+" = "+hex(parameters[par][0])+" (type = "+parameters[par][1]+" raw = "+parameters[par][2]+")")        
                     except:
                         print (par+" = "+str(parameters[par][0])+" (type = "+parameters[par][1]+" raw = "+parameters[par][2]+")")
+                '''        
 
             elif (line == 'defines') or (line == 'macros'):
                 defines= ivp.getDefines()
-                for macro in defines:
-                    print ("`"+macro+": "+defines[macro])        
+                for macro,val in sorted(parameters.items()):
+                    print ("`"+macro+": "+val)        
+
+#                for macro in defines:
+#                    print ("`"+macro+": "+defines[macro])        
             else:
                 cmdLine=line.split()
                 rslt= execTask(cmdLine)

py393/verilog_utils.py

+from __future__ import print_function
+'''
+# Copyright (C) 2015, Elphel.inc.
+# Methods that mimic Verilog tasks used for simulation  
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+@author:     Andrey Filippov
+@copyright:  2015 Elphel, Inc.
+@license:    GPLv3.0+
+@contact:    andrey@elphel.coml
+@deffield    updated: Updated
+'''
+__author__ = "Andrey Filippov"
+__copyright__ = "Copyright 2015, Elphel, Inc."
+__license__ = "GPL"
+__version__ = "3.0+"
+__maintainer__ = "Andrey Filippov"
+__email__ = "andrey@elphel.com"
+__status__ = "Development"
+#import sys
+#import x393_mem
+#MCNTRL_TEST01_CHN4_STATUS_CNTRL=0
+def hx(obj):
+    try:
+        return "0x%x"%obj
+    except:
+        return str(obj)
+'''
+Simulate Verilog concatenation. Input list tuple of items, each being a pair of (value, width)
+'''    
+def concat(items):
+    val=0
+    width=0
+    for vw in reversed(items):
+        v=vw[0]
+        if vw[1]==1:
+            v=(0,1)[v] # So True/False will also work, not juet o/1
+        val |= (v & ((1 << vw[1])-1))<<width
+        width += vw[1]
+    return (val,width)
+
+def bits(val,field):
+    try:
+        high=field[0]
+        low=field[1]
+        if low > high:
+            low,high=high,low
+    except:
+        low=field+0 # will be error if not a number
+        high=low
+    return (val >> low) & ((1 << (high-low+1))-1)    
+def getParWidthLo(bitRange):
+        if bitRange=='INTEGER':
+            return (32,0)
+        else:
+            try:
+                if bitRange[0] != '[':
+                    return None # may also fail through except if bitRange=""
+                startPosHi=1
+                endPosHi=bitRange.index(':')
+                startPosLo=endPosHi+1
+                endPosLo=bitRange.index(']')
+                if endPosHi<0:
+                    endPosHi=endPosLo
+                    startPosLo=-1
+            except:
+                return None
+            if endPosHi <0:
+                return None # no ":" or terminating "]"
+            loBit=0
+            try:
+                if startPosLo >0:
+                    loBit=int(bitRange[startPosLo,endPosLo])
+                    width=int(bitRange[startPosHi,endPosHi])-loBit+1
+                return (width,loBit)
+            except:
+                return None # could not parse: undefined width
+                    
+def getParWidth(bitRange):
+    wl=getParWidthLo(bitRange)
+#    print("bitRange=%s wl=%s"%(bitRange,str(wl)))
+    if not wl:
+        return None
+    else:
+        return wl[0]
+                    
+            
\ No newline at end of file

py393/x393_axi_control_status.py

@@ -32,36 +32,8 @@ __status__ = "Development"
 #import x393_mem
 from import_verilog_parameters import VerilogParameters
 from x393_mem import X393Mem
-#MCNTRL_TEST01_CHN4_STATUS_CNTRL=0
-def hx(obj):
-    try:
-        return "0x%x"%obj
-    except:
-        return str(obj)
-'''
-Simulate Verilog concatenation. Input list tuple of items, each being a pair of (value, width)
-'''    
-def concat(items):
-    val=0
-    width=0
-    for vw in reversed(items):
-        v=vw[0]
-        if vw[1]==1:
-            v=(0,1)[v] # So True/False will also work, not juet o/1
-        val |= (v & ((1 << vw[1])-1))<<width
-        width += vw[1]
-    return (val,width)
-
-def bits(val,field):
-    try:
-        high=field[0]
-        low=field[1]
-        if low > high:
-            low,high=high,low
-    except:
-        low=field+0 # will be error if not a number
-        high=low
-    return (val >> low) & ((1 << (high-low+1))-1)    
+#from verilog_utils import hx,concat, bits 
+from verilog_utils import hx 
         
 class X393AxiControlStatus(object):
     DRY_MODE= True # True

py393/x393_mcntrl_timing.py

+from __future__ import print_function
+'''
+# Copyright (C) 2015, Elphel.inc.
+# Methods that mimic Verilog tasks used for simulation  
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+@author:     Andrey Filippov
+@copyright:  2015 Elphel, Inc.
+@license:    GPLv3.0+
+@contact:    andrey@elphel.coml
+@deffield    updated: Updated
+'''
+__author__ = "Andrey Filippov"
+__copyright__ = "Copyright 2015, Elphel, Inc."
+__license__ = "GPL"
+__version__ = "3.0+"
+__maintainer__ = "Andrey Filippov"
+__email__ = "andrey@elphel.com"
+__status__ = "Development"
+#import sys
+#import x393_mem
+#x393_pio_sequences
+from import_verilog_parameters import VerilogParameters
+from x393_mem import X393Mem
+from x393_axi_control_status import X393AxiControlStatus
+#from verilog_utils import * # concat, bits 
+#from verilog_utils import hx, concat, bits, getParWidth 
+from verilog_utils import concat, getParWidth 
+#from x393_axi_control_status import concat, bits 
+class X393McntrlTiming(object):
+    DRY_MODE= True # True
+    DEBUG_MODE=1
+#    vpars=None
+    x393_mem=None
+    x393_axi_tasks=None #x393X393AxiControlStatus
+    target_phase=0 # TODO: set!
+    target_phase=0
+    def __init__(self, debug_mode=1,dry_mode=True):
+        self.DEBUG_MODE=debug_mode
+        self.DRY_MODE=dry_mode
+        self.x393_mem=X393Mem(debug_mode,dry_mode)
+        self.x393_axi_tasks=X393AxiControlStatus(debug_mode,dry_mode)
+        self.__dict__.update(VerilogParameters.__dict__["_VerilogParameters__shared_state"]) # Add verilog parameters to the class namespace
+    def get_target_phase(self):
+        return self.target_phase
+    def axi_set_same_delays(self,         #
+                            dq_idelay,    # input [7:0] dq_idelay;
+                            dq_odelay,    # input [7:0] dq_odelay;
+                            dqs_idelay,   # input [7:0] dqs_idelay;
+                            dqs_odelay,   # input [7:0] dqs_odelay;
+                            dm_odelay,    # input [7:0] dm_odelay;
+                            cmda_odelay): # input [7:0] cmda_odelay;
+        print("SET DELAYS(0x%x,0x%x,0x%x,0x%x,0x%x,0x%x)"%(dq_idelay,dq_odelay,dqs_idelay,dqs_odelay,dm_odelay,cmda_odelay))
+        self.axi_set_dq_idelay(dq_idelay)
+        self.axi_set_dq_odelay(dq_odelay)
+        self.axi_set_dqs_idelay(dqs_idelay)
+        self.axi_set_dqs_odelay(dqs_odelay)
+        self.axi_set_dm_odelay(dm_odelay)
+        self.axi_set_cmda_odelay(cmda_odelay)
+    
+    def axi_set_dqs_odelay_nominal(self):
+        self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE0_ODELAY + 8,      (self.DLY_LANE0_ODELAY >> (8<<3)) & 0xff) # 32'hff);
+        self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE1_ODELAY + 8,      (self.DLY_LANE1_ODELAY >> (8<<3)) & 0xff) # 32'hff);
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0);
+
+    def axi_set_dqs_idelay_nominal(self):
+        self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE0_IDELAY + 8,      (self.DLY_LANE0_IDELAY >> (8<<3)) & 0xff) # 32'hff);
+        self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE1_IDELAY + 8,      (self.DLY_LANE1_IDELAY >> (8<<3)) & 0xff) # 32'hff);
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0);
+
+    def axi_set_dqs_idelay_wlv(self):
+        self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE0_IDELAY + 8,      self.DLY_LANE0_DQS_WLV_IDELAY)
+        self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE1_IDELAY + 8,      self.DLY_LANE1_DQS_WLV_IDELAY)
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0)
+
+    def axi_set_delays(self): #  set all individual delays
+        for i in range(0,10): # (i=0;i<10;i=i+1) begin
+            self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE0_ODELAY + i,     (self.DLY_LANE0_ODELAY >> (i<<3)) & 0xff) # 32'hff);
+        for i in range(0,9): # (i=0;i<9;i=i+1) begin
+            self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE0_IDELAY + i,      (self.DLY_LANE0_IDELAY >> (i<<3)) & 0xff) # 32'hff);
+        for i in range(0,10): # (i=0;i<10;i=i+1) begin
+            self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE1_ODELAY + i,      (self.DLY_LANE1_ODELAY >> (i<<3)) & 0xff) # 32'hff);
+        for i in range(0,9): # (i=0;i<9;i=i+1) begin
+            self.x393_axi_tasks.write_contol_register(self.LD_DLY_LANE1_IDELAY + i,      (self.DLY_LANE1_IDELAY >> (i<<3)) & 0xff) # 32'hff);
+        for i in range(0,32): # (i=0;i<32;i=i+1) begin
+            self.x393_axi_tasks.write_contol_register(self.LD_DLY_CMDA + i,      (self.DLY_CMDA >> (i<<3)) & 0xff) # 32'hff);
+        self.x393_axi_tasks.axi_set_phase(self.DLY_PHASE); # also sets all delays
+        
+    def axi_set_dq_idelay(self,   #  sets same delay to all dq idelay
+                          delay): # input [7:0] delay;
+        print("SET DQ IDELAY=0x%x"%delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE0_IDELAY, 8, delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE1_IDELAY, 8, delay)
+        self.x393_axi_tasks.write_contol_register  (self.DLY_SET,0);# // set all delays
+        
+    def axi_set_dq_odelay(self,
+                          delay): # input [7:0] delay;
+        print("SET DQ ODELAY=0x%x"%delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE0_ODELAY, 8, delay);
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE1_ODELAY, 8, delay);
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0); # set all delays
+        
+    def axi_set_dqs_idelay(self,
+                           delay): # input [7:0] delay;
+        print("SET DQS IDELAY=0x%x"%delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE0_IDELAY + 8, 1, delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE1_IDELAY + 8, 1, delay)
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0); # set all delays
+
+    def axi_set_dqs_odelay(self,
+                           delay): # input [7:0] delay;
+        print("SET DQS ODELAY=0x%x"%delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE0_ODELAY + 8, 1, delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE1_ODELAY + 8, 1, delay)
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0); # set all delays
+
+    def axi_set_dm_odelay (self,
+                           delay): # input [7:0] delay;
+        print("SET DQM IDELAY=0x%x"%delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE0_ODELAY + 9, 1, delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_LANE1_ODELAY + 9, 1, delay)
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0) #  set all delays
+
+    def axi_set_cmda_odelay(self,
+                           delay): # input [7:0] delay;
+        print("SET COMMAND and ADDRESS ODELAY=0x%x"%delay)
+        self.x393_axi_tasks.axi_set_multiple_delays(self.LD_DLY_CMDA, 32, delay);
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0)  # set all delays
+        
+    def axi_set_multiple_delays(self,
+                                reg_addr, #input [29:0] reg_addr;
+                                number,   # input integer number;
+                                delay):   # input [7:0]  delay;
+        for i in range(0,number): # (i=0;i<number;i=i+1) begin
+            self.x393_axi_tasks.write_contol_register(reg_addr + i, delay) # {24'b0,delay}); // control regiter address
+
+    def axi_set_phase(self,
+                      phase): # input [PHASE_WIDTH-1:0] phase;
+        print("SET CLOCK PHASE=0x%x"%phase)
+        self.x393_axi_tasks.write_contol_register(self.LD_DLY_PHASE, phase & ((1<<self.PHASE_WIDTH)-1)) # {{(32-PHASE_WIDTH){1'b0}},phase}); // control regiter address
+        self.x393_axi_tasks.write_contol_register(self.DLY_SET,0)
+        self.target_phase = phase
+            
+    def axi_set_wbuf_delay(self,
+                            delay): # input [3:0] delay;
+        print("SET WBUF DELAY=0x%x"%delay)
+        self.x393_axi_tasks.write_contol_register(self.MCONTR_PHY_16BIT_ADDR+self.MCONTR_PHY_16BIT_WBUF_DELAY, delay & 0xf) # {28'h0, delay});
+#set dq /dqs tristate on/off patterns
+    def axi_set_tristate_patterns(self):
+        # may fail if some of the parameters used have undefined width
+        delays=concat((0,16), #  {16'h0, 
+                      (self.DQSTRI_LAST, getParWidth(self.DQSTRI_LAST__TYPE)),      #  DQSTRI_LAST,
+                      (self.DQSTRI_FIRST,getParWidth(self.DQSTRI_FIRST__TYPE)),     #  DQSTRI_FIRST,
+                      (self.DQTRI_LAST,  getParWidth(self.DQTRI_LAST_FIRST__TYPE)), #   DQTRI_LAST,
+                      (self.DQTRI_FIRST, getParWidth(self.DQTRI_FIRST__TYPE))       #   DQTRI_FIRST});
+                      )
+        print("SET TRISTATE PATTERNS, combined delays=0x%x"%delays)    
+        self.x393_axi_tasks.write_contol_register(self.MCONTR_PHY_16BIT_ADDR +self.MCONTR_PHY_16BIT_PATTERNS_TRI, delays) #  DQSTRI_LAST, DQSTRI_FIRST, DQTRI_LAST, DQTRI_FIRST});
+
+    def axi_set_dqs_dqm_patterns(self):
+        print("SET DQS+DQM PATTERNS")
+# set patterns for DM (always 0) and DQS - always the same (may try different for write lev.)        
+        self.x393_axi_tasks.write_contol_register(self.MCONTR_PHY_16BIT_ADDR + self.MCONTR_PHY_16BIT_PATTERNS, 0x55) # 32'h0055);

py393/x393_pio_sequences.py

@@ -34,37 +34,9 @@ __status__ = "Development"
 from import_verilog_parameters import VerilogParameters
 from x393_mem import X393Mem
 from x393_axi_control_status import X393AxiControlStatus
-#MCNTRL_TEST01_CHN4_STATUS_CNTRL=0
-def hx(obj):
-    try:
-        return "0x%x"%obj
-    except:
-        return str(obj)
-'''
-Simulate Verilog concatenation. Input list tuple of items, each being a pair of (value, width)
-'''    
-def concat(items):
-    val=0
-    width=0
-    for vw in reversed(items):
-        v=vw[0]
-        if vw[1]==1:
-            v=(0,1)[v] # So True/False will also work, not juet o/1
-        val |= (v & ((1 << vw[1])-1))<<width
-        width += vw[1]
-    return (val,width)
-
-def bits(val,field):
-    try:
-        high=field[0]
-        low=field[1]
-        if low > high:
-            low,high=high,low
-    except:
-        low=field+0 # will be error if not a number
-        high=low
-    return (val >> low) & ((1 << (high-low+1))-1)    
-        
+#from verilog_utils import * # concat, bits 
+from verilog_utils import concat, bits 
+#from x393_axi_control_status import concat, bits 
 class X393PIOSequences(object):
     DRY_MODE= True # True
     DEBUG_MODE=1