damsi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a95c29d3df3bdb7ce0865ccb46ec2543b8f740dd2c0573a9ec2e3f8c3f6a26b
-  data.tar.gz: 6677d65b959ebfba371c6c3af8abbe6044e77b96a92860749d87382cef814ffd
+  metadata.gz: 0444c06e388d5a2f3607c93e295bfea0ee4e05fe6e35f061bb2a06c1db829b1b
+  data.tar.gz: dcacff4b6f85d24e100c3f44c558dc296c4f7f39c420223a013ab6cade5982fc
 SHA512:
-  metadata.gz: 619999e4795c7e1fcd019843bd816c86cfbbf8150043bddea276f3950997ab37aafe81eb9b2419db62d6338acb820056c939a61b3ee7d6ebe75d500621612294
-  data.tar.gz: 9b5973c624a55246fc7f9178c9b0f275676fda497637d6aaac44da839b1df38811617930656dccb784544d23e71b74709604ac28264fda6e11be04d8dd9d4a50
+  metadata.gz: c43ad00f6d505468a7124a0ec888ca211fcef03fb90d84730b856c3bf6b2e69f43a83ede23b5f4a355b08c80756cf4168ef4bc8d953f8603c4bdad18750d1617
+  data.tar.gz: b1e55fdc9ea45a9b874e1b9ae3de078a655617f37cfc3fba39a3262c82d290458ede2943ab3291208021384335c91f46461ba559ebff79aad19b0e3faf0be883

data/.github/workflows/pdd.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 jobs:
   pdd:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: g4s8/pdd-action@master

data/.github/workflows/xcop.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 jobs:
   xcop:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: g4s8/xcop-action@master

data/.rubocop.yml

@@ -23,3 +23,5 @@ Style/ClassAndModuleChildren:
   Enabled: false
 Metrics/BlockLength:
   Max: 50
+Metrics/ClassLength:
+  Max: 200

data/Gemfile

@@ -26,6 +26,6 @@ gem 'minitest', '5.19.0', require: false
 gem 'rake', '13.0.6', require: false
 gem 'rdoc', '6.5.0', require: false
 gem 'rubocop', '1.55.1', require: false
-gem 'rubocop-rspec', '2.23.0', require: false
+gem 'rubocop-rspec', '2.23.2', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'xcop', '0.7.1', require: false

data/README.md

@@ -9,34 +9,18 @@
 
 It's a simulator of a dataflow machine.
 
-First, you define a dataflow graph and save it to `fibo.dfg` 
-(this is the calculator of the 5th Fibonacci number):
+First, you define a dataflow graph and save it to `test.dfg`:
 
 ```
-send :fibo n:5
-send :if f:1
-recv :fibo [:n] do
-  send :gt n:n
-  send :dec1 n:n
-  send :dec2 n:n
-  send :sum a:n  # if tagged
-  send :sum b:n  # if tagged right
+recv :start do
+  send :sum, :a, 10
+  send :sum, :b, 15
 end
-recv :if [:c, :t, :f] do
-  if c
-    send :fibo n:t
-  else
-    send :fibo n:f
-  end
+recv :sum do |a, b|
+  send :mul, :x, (a+b)
 end
-recv :sum [:a, :b] do
-  send :if (a + b)
-end
-recv :dec1 [:n] do
-  send :fibo n:(n-1)
-end
-recv :dec2 [:n] do
-  send :fibo n:(n-2)
+recv :mul do |x|
+  send :stop, :x, x
 end
 ```
 

data/lib/damsi/advisor.rb

@@ -0,0 +1,54 @@
+# Copyright (c) 2023 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Distribution Advisor.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2023 Yegor Bugayenko
+# License:: MIT
+class Damsi::Advisor
+  def initialize(dfg, ticks, log)
+    @dfg = dfg
+    @ticks = ticks
+    @log = log
+  end
+
+  # The instruction cell (IC) is coming here and the method
+  # should return a possibly empty array of ICs.
+  def redirect(cell)
+    v1 = cell[:v1]
+    vw = cell[:v2]
+    v2 = vw
+    arc = cell[:arc]
+    data = cell[:data]
+    a = @dfg.m?(vw, nil)
+    vr = @dfg.e?(:k, vw, nil)
+    @log.debug("DA: a:#{a}, vr:#{vr}")
+    if @dfg.e?(:d, v1, vw) && @dfg.m?(vr, a)
+      v2 = @dfg.e?(:d, vr, nil)
+      @log.debug("DA: v1:#{v1}, v2:#{vw}->#{v2}, arc:#{arc}, data:#{data}")
+      @ticks.push(cell[:tick], "\\texttt{\\frenchspacing{}DA: #{vw}.#{arc} → #{v2}.#{arc}}")
+    else
+      @log.debug("DA: v1:#{v1}, v2:#{v2}, arc:#{arc}, data:#{data}")
+    end
+    after = cell
+    after[:v2] = v2
+    [after]
+  end
+end

data/lib/damsi/dfg.rb

@@ -19,8 +19,9 @@
 # SOFTWARE.
 
 require_relative 'ticks'
+require_relative 'advisor'
 
-# Dataflow Graph (DFG)
+# Dataflow Graph (DFG).
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2023 Yegor Bugayenko
 # License:: MIT
@@ -34,6 +35,45 @@ class Damsi::DFG
     @tick = 0
     @op = nil
     @started = []
+    @advisor = Damsi::Advisor.new(self, @ticks, log)
+    @links = []
+    @edges = []
+  end
+
+  # Add edge (only for information).
+  def edge(arc, left, right)
+    @edges.push({ arc: arc, v1: left, v2: right })
+  end
+
+  # The edge exists?
+  def e?(arc, left, right)
+    @edges.each do |e|
+      next if !arc.nil? && e[:arc] != arc
+      next if !left.nil? && e[:v1] != left
+      next if !right.nil? && e[:v2] != right
+      return e[:arc] if arc.nil?
+      return e[:v1] if left.nil?
+      return e[:v2] if right.nil?
+      return true
+    end
+    false
+  end
+
+  # Add link to external entity, like RAM.
+  def link(vtx, ext)
+    @links.push({ vtx: vtx, ext: ext })
+  end
+
+  # The semantic of the vertex is memory related?
+  def m?(vtx, ext)
+    @links.each do |l|
+      next if !vtx.nil? && l[:vtx] != vtx
+      next if !ext.nil? && l[:ext] != ext
+      return l[:vtx] if vtx.nil?
+      return l[:ext] if ext.nil?
+      return true
+    end
+    false
   end
 
   def cell(vtx)
@@ -44,12 +84,13 @@ class Damsi::DFG
     @ticks.push(@tick, "\\texttt{\\frenchspacing{}#{@op}: #{tex}}")
   end
 
-  def send(vtx, args)
-    @cells[vtx] = {} if @cells[vtx].nil?
-    args.each do |k, a|
-      @cells[vtx][k] = a
-      @ticks.push(@tick, "\\texttt{\\frenchspacing{}#{@op}: \"#{a}\" → #{vtx}.#{k}}")
-      @log.debug("#{@tick}| #{a} -> #{vtx}.#{k}")
+  # Send "data" through the "arc" to the vertex "vtx"
+  def send(vtx, arc, data)
+    @advisor.redirect({ tick: @tick, v1: @op, v2: vtx, arc: arc, data: data }).each do |ic|
+      @cells[ic[:v2]] = {} if @cells[ic[:v2]].nil?
+      @cells[ic[:v2]][ic[:arc]] = ic[:data]
+      @ticks.push(@tick, "\\texttt{\\frenchspacing{}#{@op}: \"#{ic[:data]}\" → #{ic[:v2]}.#{ic[:arc]}}")
+      @log.debug("#{@tick}| #{ic[:data]} -> #{ic[:v2]}.#{ic[:arc]}")
     end
   end
 

data/lib/damsi/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2023 Yegor Bugayenko
 # License:: MIT
 module Damsi
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/test/test_advisor.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2023 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'loog'
+require_relative '../lib/damsi/ticks'
+require_relative '../lib/damsi/advisor'
+
+# Test for Advisor.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2023 Yegor Bugayenko
+# License:: MIT
+class TestAdvisor < Minitest::Test
+  def test_simple_redirect
+    dfg = Damsi::DFG.new('', Loog::NULL)
+    da = Damsi::Advisor.new(dfg, Damsi::Ticks.new, Loog::NULL)
+    cell = {}
+    ics = da.redirect(cell)
+    assert_equal(1, ics.length)
+  end
+end

data/test/test_dfg.rb

@@ -29,18 +29,68 @@ require_relative '../lib/damsi/ticks'
 # Copyright:: Copyright (c) 2023 Yegor Bugayenko
 # License:: MIT
 class TestDFG < Minitest::Test
+  def test_edges_finding
+    dfg = Damsi::DFG.new(
+      '
+      edge :a, :v1, :v2
+      edge :b, :v1, :v2
+      ',
+      Loog::NULL
+    )
+    dfg.simulate
+    assert(dfg.e?(:a, :v1, :v2))
+  end
+
+  def test_edges_finding_by_mask
+    dfg = Damsi::DFG.new(
+      '
+      edge :a, :v1, :v2
+      edge :b, :v1, :v2
+      ',
+      Loog::NULL
+    )
+    dfg.simulate
+    assert_equal(:v2, dfg.e?(:a, :v1, nil))
+  end
+
+  def test_links_finding
+    dfg = Damsi::DFG.new(
+      '
+      link :v1, "foo"
+      link :v2, "bar"
+      ',
+      Loog::NULL
+    )
+    dfg.simulate
+    assert(dfg.m?(:v1, 'foo'))
+    assert(!dfg.m?(:v1, 'bar'))
+  end
+
+  def test_links_finding_by_mask
+    dfg = Damsi::DFG.new(
+      '
+      link :v1, "foo"
+      link :v2, "bar"
+      ',
+      Loog::NULL
+    )
+    dfg.simulate
+    assert_equal(:v1, dfg.m?(nil, 'foo'))
+    assert_equal('bar', dfg.m?(:v2, nil))
+  end
+
   def test_primitive_summator
     dfg = Damsi::DFG.new(
       '
       recv :start do
-        send :sum, a:10
-        send :sum, b:15
+        send :sum, :a, 10
+        send :sum, :b, 15
       end
       recv :sum do |a, b|
-        send :mul, x: (a+b)
+        send :mul, :x, (a+b)
       end
       recv :mul do |x|
-        send :stop, x: x
+        send :stop, :x, x
       end
       ',
       Loog::NULL
@@ -61,30 +111,118 @@ class TestDFG < Minitest::Test
       end
       recv :r1 do
         msg "Read #{@data} from RAM"
-        send :nxt1, d:@data
+        send :nxt1, :d, @data
+      end
+      recv :nxt1 do |d|
+        n = next_random(d)
+        msg "Shift from #{d} to #{n}"
+        send :w1, :d, n
+      end
+      recv :w1 do |d|
+        @data = d
+        msg "Write #{d} to RAM"
+        send :r2, :k, 1
+      end
+      recv :r2 do |k|
+        msg "Read #{@data} from RAM"
+        send :nxt2, :d, @data
+      end
+      recv :nxt2 do |d|
+        n = next_random(d)
+        msg "Shift from #{d} to #{n}"
+        send :w2, :d, n
+        send :seq, :d, n
+      end
+      recv :seq do |d|
+        send :stop, :x, d
+      end
+      ',
+      Loog::VERBOSE
+    )
+    ticks = dfg.simulate
+    assert_equal(756, dfg.cell(:stop)[:x])
+    tex = TeX.new
+    ticks.to_latex(tex)
+    tex.to_pdf(path: '/tmp/damsi.pdf', tex: '/tmp/damsi.tex')
+  end
+
+  def test_prng_with_links
+    dfg = Damsi::DFG.new(
+      '
+      @data = 42
+      def next_random(n)
+        (n * n) / 16 & 0xffff
+      end
+
+      edge :d, :r1, :nxt1
+      edge :d, :nxt1, :w1
+      edge :k, :w1, :r2
+      edge :d, :r2, :nxt2
+      edge :d, :nxt2, :w2
+      edge :d, :nxt2, :seq
+
+      link :r1, "RAM"
+      recv :r1 do
+        msg "Read #{@data} from RAM"
+        send :nxt1, :d, @data
       end
       recv :nxt1 do |d|
         n = next_random(d)
         msg "Shift from #{d} to #{n}"
-        send :w1, d:n
+        send :w1, :d, n
       end
+      link :w1, "RAM"
       recv :w1 do |d|
         @data = d
         msg "Write #{d} to RAM"
-        send :r2, k:1
+        send :r2, :k, 1
       end
+      link :r2, "RAM"
       recv :r2 do |k|
         msg "Read #{@data} from RAM"
-        send :nxt2, d:@data
+        send :nxt2, :d, @data
+      end
+      link :w2, "RAM"
+      recv :nxt2 do |d|
+        n = next_random(d)
+        msg "Shift from #{d} to #{n}"
+        send :w2, :d, n
+        send :seq, :d, n
+      end
+      ',
+      Loog::VERBOSE
+    )
+    ticks = dfg.simulate
+    assert_equal(756, dfg.cell(:seq)[:d])
+    tex = TeX.new
+    ticks.to_latex(tex)
+    tex.to_pdf(path: '/tmp/damsi.pdf', tex: '/tmp/damsi.tex')
+  end
+
+  def test_prng_optimized
+    dfg = Damsi::DFG.new(
+      '
+      @data = 42
+      def next_random(n)
+        (n * n) / 16 & 0xffff
+      end
+      recv :r1 do
+        msg "Read #{@data} from RAM"
+        send :nxt1, :d, @data
+      end
+      recv :nxt1 do |d|
+        n = next_random(d)
+        msg "Shift from #{d} to #{n}"
+        send :nxt2, :d, n
       end
       recv :nxt2 do |d|
         n = next_random(d)
         msg "Shift from #{d} to #{n}"
-        send :w2, d:n
-        send :seq, d:n
+        send :w2, :d, n
+        send :seq, :d, n
       end
       recv :seq do |d|
-        send :stop, x:d
+        send :stop, :x, d
       end
       ',
       Loog::VERBOSE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: damsi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -95,11 +95,13 @@ files:
 - features/support/env.rb
 - fixtures/fibonacci.dfg
 - fixtures/sum.dfg
+- lib/damsi/advisor.rb
 - lib/damsi/dfg.rb
 - lib/damsi/ticks.rb
 - lib/damsi/version.rb
 - renovate.json
 - test/test__helper.rb
+- test/test_advisor.rb
 - test/test_dfg.rb
 - test/test_tex.rb
 - test/test_ticks.rb