axi_tdl 0.0.10 → 0.1.0

data/lib/tdl/exlib/dve_tcl.rb

@@ -67,10 +67,10 @@ gui_show_grid -id ${Wave.3} -enable false
 }
     end
 
-    def self.dev_signals_to_tcl(flag: gname ,signals: [])
+    def self.dev_signals_to_tcl(flag: gname ,signals: [], group_name: nil )
         sst = %Q{
 ## -------------- #{flag} -------------------------
-set _wave_session_group_#{flag} #{flag}
+set _wave_session_group_#{flag} #{group_name || flag}
 # set _wave_session_group_#{flag} [gui_sg_generate_new_name -seed #{flag}]
 if {[gui_sg_is_group -name "$_wave_session_group_#{flag}"]} {
     set _wave_session_group_#{flag} [gui_sg_generate_new_name]
@@ -109,7 +109,7 @@ gui_sg_addsignal -group "$_wave_session_group_#{flag}_#{iname}" { #{signals.map{
         "gui_list_set_insertion_bar  -id ${Wave.3} -group ${Group2_#{flag}}  -position in"
     end
 
-    def self.gen_dev_wave_tcl(khash) # {group_name : [*signal]}
+    def self.gen_dev_wave_tcl(khash) # {group_name<sdlmodule instance name> : [*signal]}
         add_ss = []
         add_list = []
         add_bar = []
@@ -128,21 +128,41 @@ gui_sg_addsignal -group "$_wave_session_group_#{flag}_#{iname}" { #{signals.map{
                 end
             end
             signals = base_elms.map do |e| 
-                unless e.tp_instance.filter_block
-                    e.root_ref.sub("$root.","Sim:") 
+                # if e.respond_to? :tp_instance
+                #     if e.tp_instance.filter_block
+                #         e.root_ref(&e.tp_instance.filter_block).sub("$root.","Sim:") 
+                #     else
+                #         e.root_ref.sub("$root.","Sim:") 
+                #     end
+                # else
+                #     e.root_ref.sub("$root.","Sim:")
+                # end
+                xb = e.instance_variable_get("@dve_wave_filter_block")
+                if xb
+                    e.root_ref(&xb).sub("$root.","Sim:") 
                 else
-                    e.root_ref(&e.tp_instance.filter_block).sub("$root.","Sim:") 
+                    e.root_ref.sub("$root.","Sim:")
                 end
             end
 
             add_ss  << dev_signals_to_tcl(flag: k, signals: signals )
 
             intf_elms.each do |e|
-
-                unless e.tp_instance.filter_block
-                    signalx = e.root_ref.sub("$root.","Sim:") 
+                # if e.respond_to? :tp_instance
+                #     unless e.tp_instance.filter_block
+                #         signalx = e.root_ref.sub("$root.","Sim:") 
+                #     else
+                #         signalx = e.root_ref(&e.tp_instance.filter_block).sub("$root.","Sim:") 
+                #     end
+                # else
+                #     signalx = e.root_ref.sub("$root.","Sim:") 
+                # end
+                xb = e.instance_variable_get("@dve_wave_filter_block")
+
+                if xb
+                    signalx = e.root_ref(&xb).sub("$root.","Sim:") 
                 else
-                    signalx = e.root_ref(&e.tp_instance.filter_block).sub("$root.","Sim:") 
+                    signalx = e.root_ref.sub("$root.","Sim:") 
                 end
 
                 add_ss << dev_interface_to_tcl(flag: k, iname: e.inst_name ,signals: [ signalx ])
@@ -158,5 +178,4 @@ gui_sg_addsignal -group "$_wave_session_group_#{flag}_#{iname}" { #{signals.map{
         dve_tcl_temp(add_ss.join("\n"), add_list.join("\n"), add_bar.join("\n") )
 
     end
-
 end

data/lib/tdl/exlib/itegration.rb

@@ -12,8 +12,10 @@ class StringBandItegration < String
             obj
         end
 
-        stringbanditegration.itgt.define_singleton_method(stringbanditegration.key) do
-            obj
+        if stringbanditegration.origin_str.to_s != stringbanditegration.key.to_s
+            stringbanditegration.itgt.define_singleton_method(stringbanditegration.key) do
+                obj
+            end
         end
         obj
     end
@@ -271,7 +273,17 @@ class String ## add to itegration names_pool
     def snoop(itgt=nil,sdlmodule=nil)
         itgt ||= $_implicit_curr_itgt_.last
         if sdlmodule
-            sdlmodule.signal(itgt.names_pool[self])
+            # unless sdlmodule.has_signal?(itgt.names_pool[self])
+            unless sdlmodule.respond_to?(itgt.names_pool[self])
+                if sdlmodule.is_a?(TopModule) && sdlmodule.techbench.respond_to?(itgt.names_pool[self])
+                    sdlmodule.techbench.signal(itgt.names_pool[self])
+                else 
+                    sdlmodule.signal(itgt.names_pool[self])
+                    # raise TdlError.new("Dont have `#{itgt.names_pool[self]}` in module <#{sdlmodule.module_name}>" )
+                end
+            else 
+                sdlmodule.signal(itgt.names_pool[self])
+            end
         else
             itgt.top_module.signal(itgt.names_pool[self])
         end

data/lib/tdl/exlib/itegration_verb.rb

@@ -354,25 +354,25 @@ class ItegrationVerb
         _names_pool_inst()
         # @itgt_links = ItgtLinks.new(self)
         ## 为child module 生成方法
-        init_children_modules()
+        # init_children_modules()
         # init_children_modules_post()
     end
 
-    def init_children_modules
-        blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_hash_") || {}
-        blocks_hash_post = self.class.instance_variable_get("@_sdl_eval_blocks_post_hash_") || {}
-        dir_hash = self.class.instance_variable_get("@_sdl_eval_dir_hash_")
+    # def init_children_modules
+    #     blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_hash_") || {}
+    #     blocks_hash_post = self.class.instance_variable_get("@_sdl_eval_blocks_post_hash_") || {}
+    #     dir_hash = self.class.instance_variable_get("@_sdl_eval_dir_hash_")
 
-        blocks_hash = blocks_hash.merge blocks_hash_post
+    #     blocks_hash = blocks_hash.merge blocks_hash_post
 
-        blocks_hash.keys.each do |key|
+    #     blocks_hash.keys.each do |key|
 
-            sdlm = SdlModule.new(name:self.class.to_s + "_#{@nickname}#{key}",out_sv_path:dir_hash[key])
-            define_singleton_method(key) do
-                sdlm
-            end
-        end
-    end
+    #         sdlm = SdlModule.new(name:self.class.to_s + "_#{@nickname}#{key}",out_sv_path:dir_hash[key])
+    #         define_singleton_method(key) do
+    #             sdlm
+    #         end
+    #     end
+    # end
 
     # def init_children_modules_post
     #     blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_post_hash_")
@@ -387,20 +387,20 @@ class ItegrationVerb
     #     end
     # end
 
-    def gen_children_modules
-        blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_hash_") || {}
-        blocks_hash_post = self.class.instance_variable_get("@_sdl_eval_blocks_post_hash_") || {}
-        blocks_hash = blocks_hash.merge blocks_hash_post
-        blocks_hash.keys.each do |key|
-            self.send(key).gen_sv_module()
-        end
-    end
+    # def gen_children_modules
+    #     blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_hash_") || {}
+    #     blocks_hash_post = self.class.instance_variable_get("@_sdl_eval_blocks_post_hash_") || {}
+    #     blocks_hash = blocks_hash.merge blocks_hash_post
+    #     blocks_hash.keys.each do |key|
+    #         self.send(key).gen_sv_module()
+    #     end
+    # end
 
         # define_singleton_method(:inst) do
     def inst
         # 先生成子模块
         ## 执行 生成 sdl module
-        inst_child_module()
+        # inst_child_module()
 
         blocks = self.class.instance_variable_get("@_inst_blocks_")
         ItegrationVerb.curr_itgt_push(self)
@@ -422,7 +422,7 @@ class ItegrationVerb
         end
 
         ## 执行 生成 sdl module
-        inst_child_module_post()
+        # inst_child_module_post()
 
         ## 执行top module techbench eval
         tb_inst()
@@ -431,7 +431,8 @@ class ItegrationVerb
         ## 执行 约束
         inst_constraints()
         ## 执行单元测试
-        test_unit_inst()
+        ## 改到 运行 top_module _exec_add_test_unit 那边执行
+        # test_unit_inst()
     end
 
     def tb_inst
@@ -464,8 +465,11 @@ class ItegrationVerb
         return if blocks.empty?
         ItegrationVerb.curr_itgt_push self
 
-        return unless TopModule.sim
-       
+        unless TopModule.sim
+            ItegrationVerb.curr_itgt_pop
+            return 
+        end
+
         blocks.each do |b|
             # @top_module.techbench.instance_exec(self,&b.clone)
             sdlm = TestUnitModule.new(name: b[0],out_sv_path: b[1])
@@ -486,62 +490,94 @@ class ItegrationVerb
 
     end
 
-    def inst_child_module
-        blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_hash_")
-        return unless blocks_hash
-        ItegrationVerb.curr_itgt_push self
-        $_implicit_curr_itgt_.with_none_itgt do 
-            blocks_hash.keys.each do |key|
-                sdlm = self.send(key)
-
-
-                blocks = blocks_hash[key]
-                if blocks.length ==  1
-                    block = blocks[0]
-                    sdlm.instance_exec(self,&block)
-                elsif blocks.length >  1
-                    # block = Proc.new do
-                        blocks.each do |b|
-                            # b.call
-                            sdlm.instance_exec(self,&b)
-                        end
-                    # end
-                else
-                    ;
-                end
-            end
-        end
-        ItegrationVerb.curr_itgt_pop
-    end
+    def self.test_unit_inst(&filter_block)
+        # blocks = self.instance_variable_get("@_inst_test_unit_blocks_")
+        # blocks = instance_variable_get("@_inst_test_unit_blocks_") || []
+        blocks = @@_inst_test_unit_blocks_
+        return unless blocks
+        return if blocks.empty?
+        return unless TopModule.sim
 
-    def inst_child_module_post
-        blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_post_hash_")
-        return unless blocks_hash
-        ItegrationVerb.curr_itgt_push self
-        $_implicit_curr_itgt_.with_none_itgt do
-            blocks_hash.keys.each do |key|
-                sdlm = self.send(key)
-                # $_implicit_curr_itgt_ = self
+        ItegrationVerb.curr_itgt_push nil
 
-                blocks = blocks_hash[key]
-                if blocks.length ==  1
-                    block = blocks[0]
-                    sdlm.instance_exec(self,&block)
-                elsif blocks.length >  1
-                    # block = Proc.new do
-                        blocks.each do |b|
-                            # b.call
-                            sdlm.instance_exec(self,&b)
-                        end
-                    # end
-                else
-                    next
+        blocks.each do |b|
+            # @top_module.techbench.instance_exec(self,&b.clone)
+            if !(block_given?) || filter_block.call(b[0])
+                sdlm = TestUnitModule.new(name: b[0],out_sv_path: b[1])
+                $_implicit_curr_itgt_.with_none_itgt do 
+                    sdlm.input - "from_up_pass"
+                    sdlm.output.logic - "to_down_pass"
+                end
+                sdlm.instance_exec(nil,&b[2])
+
+                if b[1] && File.exist?(b[1])
+                    sdlm.gen_sv_module
+                else 
+                    sdlm.origin_sv = true 
                 end
             end
         end
+
         ItegrationVerb.curr_itgt_pop
+
     end
 
+    # def inst_child_module
+    #     blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_hash_")
+    #     return unless blocks_hash
+    #     ItegrationVerb.curr_itgt_push self
+    #     $_implicit_curr_itgt_.with_none_itgt do 
+    #         blocks_hash.keys.each do |key|
+    #             sdlm = self.send(key)
+
+
+    #             blocks = blocks_hash[key]
+    #             if blocks.length ==  1
+    #                 block = blocks[0]
+    #                 sdlm.instance_exec(self,&block)
+    #             elsif blocks.length >  1
+    #                 # block = Proc.new do
+    #                     blocks.each do |b|
+    #                         # b.call
+    #                         sdlm.instance_exec(self,&b)
+    #                     end
+    #                 # end
+    #             else
+    #                 ;
+    #             end
+    #         end
+    #     end
+    #     ItegrationVerb.curr_itgt_pop
+    # end
+
+    # def inst_child_module_post
+    #     blocks_hash = self.class.instance_variable_get("@_sdl_eval_blocks_post_hash_")
+    #     return unless blocks_hash
+    #     ItegrationVerb.curr_itgt_push self
+    #     $_implicit_curr_itgt_.with_none_itgt do
+    #         blocks_hash.keys.each do |key|
+    #             sdlm = self.send(key)
+    #             # $_implicit_curr_itgt_ = self
+
+    #             blocks = blocks_hash[key]
+    #             if blocks.length ==  1
+    #                 block = blocks[0]
+    #                 sdlm.instance_exec(self,&block)
+    #             elsif blocks.length >  1
+    #                 # block = Proc.new do
+    #                     blocks.each do |b|
+    #                         # b.call
+    #                         sdlm.instance_exec(self,&b)
+    #                     end
+    #                 # end
+    #             else
+    #                 next
+    #             end
+    #         end
+    #     end
+    #     ItegrationVerb.curr_itgt_pop
+    # end
+
     def self.inherited(subclass)
         unless @@child.include? subclass
             @@child << subclass
@@ -589,7 +625,7 @@ class ItegrationVerb
     public
     def check_same_method(name)
         if respond_to? name.to_s
-            raise TdlError.new("Itegration can't Redefine method #{name}")
+            raise TdlError.new("Itegration `#{to_s}` can't Redefine method #{name}")
         end
     end
 
@@ -736,63 +772,64 @@ class ItegrationVerb
     ## 添加测试用例
 
     def self.def_test_unit(name,path,&block)
-        _inst_test_unit_blocks_ = instance_variable_get("@_inst_test_unit_blocks_")
-        _inst_test_unit_blocks_ ||= []
-        _inst_test_unit_blocks_ << [name.to_s, path, block]
-        instance_variable_set("@_inst_test_unit_blocks_",_inst_test_unit_blocks_)
+        # @@_inst_test_unit_blocks_ = instance_variable_get("@_inst_test_unit_blocks_")
+        @@_inst_test_unit_blocks_ ||= []
+        @@_inst_test_unit_blocks_ << [name.to_s, path, block]
+        # instance_variable_set("@_inst_test_unit_blocks_",_inst_test_unit_blocks_)
+        @@_inst_test_unit_blocks_
     end
 
     ## 生成 itgt内的模块,
-    def self.has_module(dir,*names)
-        unless File.exist? dir
-            Dir.mkdir dir
-        end
-        ## itgt 生成 sdl 模块
-        names.each do |name|
-            # unless container_hash[name.to_s]
-            #     container_hash[name.to_s] = []
-            # end
-            self.define_singleton_method("#{name}_sdl_eval") do |&block|
-                _sdl_eval_blocks_hash_ = instance_variable_get("@_sdl_eval_blocks_hash_")
-                _sdl_eval_dir_hash_ = instance_variable_get("@_sdl_eval_dir_hash_")
-                _sdl_eval_blocks_hash_ ||= {}
-                _sdl_eval_dir_hash_ ||= {}
-
-                if _sdl_eval_blocks_hash_[name]
-                    _sdl_eval_blocks_hash_[name] << block
-                    # _sdl_eval_blocks_hash_[name] << $_implicit_curr_itgt_.wrap_nont_itgt(&block)
-                    # _sdl_eval_blocks_hash_[name] << lambda {|itgt| block.call }
-                else
-                    _sdl_eval_blocks_hash_[name] = [block]
-                    # _sdl_eval_blocks_hash_[name] = [$_implicit_curr_itgt_.wrap_nont_itgt(&block)]
-                    # _sdl_eval_blocks_hash_[name] == [ lambda {|itgt| block.call }]
-                end
-
-                _sdl_eval_dir_hash_[name] = dir if dir
-                instance_variable_set("@_sdl_eval_dir_hash_",_sdl_eval_dir_hash_)
-                instance_variable_set("@_sdl_eval_blocks_hash_",_sdl_eval_blocks_hash_)
-            end
-            ## 在 top_module 后再执行
-            self.define_singleton_method("#{name}_sdl_post_eval") do |&block|
-                $_implicit_curr_itgt_.with_none_itgt do 
-                    _blocks_hash_ = instance_variable_get("@_sdl_eval_blocks_post_hash_")
-                    _sdl_eval_dir_hash_ = instance_variable_get("@_sdl_eval_dir_hash_")
-                    _blocks_hash_ ||= {}
-                    _sdl_eval_dir_hash_ ||= {}
-
-                    if _blocks_hash_[name]
-                        _blocks_hash_[name] << block    #$_implicit_curr_itgt_.wrap_nont_itgt(&block)
-                    else
-                        _blocks_hash_[name] = [block]   #[$_implicit_curr_itgt_.wrap_nont_itgt(&block)]
-                    end
-
-                    _sdl_eval_dir_hash_[name] = dir if dir
-                    instance_variable_set("@_sdl_eval_dir_hash_",_sdl_eval_dir_hash_)
-                    instance_variable_set("@_sdl_eval_blocks_post_hash_",_blocks_hash_)
-                end
-            end
-        end
-    end
+    # def self.has_module(dir,*names)
+    #     unless File.exist? dir
+    #         Dir.mkdir dir
+    #     end
+    #     ## itgt 生成 sdl 模块
+    #     names.each do |name|
+    #         # unless container_hash[name.to_s]
+    #         #     container_hash[name.to_s] = []
+    #         # end
+    #         self.define_singleton_method("#{name}_sdl_eval") do |&block|
+    #             _sdl_eval_blocks_hash_ = instance_variable_get("@_sdl_eval_blocks_hash_")
+    #             _sdl_eval_dir_hash_ = instance_variable_get("@_sdl_eval_dir_hash_")
+    #             _sdl_eval_blocks_hash_ ||= {}
+    #             _sdl_eval_dir_hash_ ||= {}
+
+    #             if _sdl_eval_blocks_hash_[name]
+    #                 _sdl_eval_blocks_hash_[name] << block
+    #                 # _sdl_eval_blocks_hash_[name] << $_implicit_curr_itgt_.wrap_nont_itgt(&block)
+    #                 # _sdl_eval_blocks_hash_[name] << lambda {|itgt| block.call }
+    #             else
+    #                 _sdl_eval_blocks_hash_[name] = [block]
+    #                 # _sdl_eval_blocks_hash_[name] = [$_implicit_curr_itgt_.wrap_nont_itgt(&block)]
+    #                 # _sdl_eval_blocks_hash_[name] == [ lambda {|itgt| block.call }]
+    #             end
+
+    #             _sdl_eval_dir_hash_[name] = dir if dir
+    #             instance_variable_set("@_sdl_eval_dir_hash_",_sdl_eval_dir_hash_)
+    #             instance_variable_set("@_sdl_eval_blocks_hash_",_sdl_eval_blocks_hash_)
+    #         end
+    #         ## 在 top_module 后再执行
+    #         self.define_singleton_method("#{name}_sdl_post_eval") do |&block|
+    #             $_implicit_curr_itgt_.with_none_itgt do 
+    #                 _blocks_hash_ = instance_variable_get("@_sdl_eval_blocks_post_hash_")
+    #                 _sdl_eval_dir_hash_ = instance_variable_get("@_sdl_eval_dir_hash_")
+    #                 _blocks_hash_ ||= {}
+    #                 _sdl_eval_dir_hash_ ||= {}
+
+    #                 if _blocks_hash_[name]
+    #                     _blocks_hash_[name] << block    #$_implicit_curr_itgt_.wrap_nont_itgt(&block)
+    #                 else
+    #                     _blocks_hash_[name] = [block]   #[$_implicit_curr_itgt_.wrap_nont_itgt(&block)]
+    #                 end
+
+    #                 _sdl_eval_dir_hash_[name] = dir if dir
+    #                 instance_variable_set("@_sdl_eval_dir_hash_",_sdl_eval_dir_hash_)
+    #                 instance_variable_set("@_sdl_eval_blocks_post_hash_",_blocks_hash_)
+    #             end
+    #         end
+    #     end
+    # end
 
     def self.record_instance_var_block(name,default=[],&block)
         _inst_ccc_ = instance_variable_get("@_#{name}_")