wardite 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3ca81e45a3da7f90566d465d5248bcac03981953e97c81681de900851348407
-  data.tar.gz: 2b0952f92a92bce4d54283868fd2565b9dbaa178cc1187b2a7f6feca6225fe57
+  metadata.gz: 89b6c42e1a3f16c39c214eb127c5b87966c0d2933257a1da7fdc96236c6a0f9b
+  data.tar.gz: 321d62cdddc61c8a342b966b3e4d7b6c01ffbbcb5788a6787fd3490ba96b1430
 SHA512:
-  metadata.gz: 8a4db779ed117465fb2c981c0b9da39dcdd001e60abf00262d04353449b5b72ad433949d6c640458fe2b61b503e84180dbf3c7709d791b48f7ed2a5ad9dbe372
-  data.tar.gz: 7d00f04205f6ef10b21dee7067adf1f480a529cea4bf0caa404fd888547f101f3908f54863262333e2b363d2d17b28b4899ff12ddc5e226958eda975354fd954
+  metadata.gz: 4b8b67989d47775828aca0908794f6b02abdea5ed653d794fa308d437f2d1735997a91dee341cdfa51aa5829aa097ca61dd262dba8479e805d1bbfd540f90ff5
+  data.tar.gz: 26face977ed4d76232bdee62f64208a22ec824314cb3d479979705fee327a1c9ce72ee960055a0c26db591f932c598b591651170fedf31b36533c52774f05fbe

data/examples/grayscale.rb

@@ -0,0 +1,64 @@
+#
+# Usage:
+#     $ bundle exec ruby --yjit examples/grayscale.rb \
+#         --wasm-file path/to/grayscale.wasm \
+#         --source tmp/source.png \
+#         --dest tmp/result.png \
+#         --width 660 --height 495
+#
+require "wardite"
+require "base64"
+require "optparse"
+require "ostruct"
+
+$options = OpenStruct.new
+
+opt = OptionParser.new
+opt.on('--wasm-file [FILE]') {|v| $options.wasm_file = v }
+opt.on('--source [IMAGE]') {|v| $options.source = v }
+opt.on('--dest [IMAGE]') {|v| $options.dest = v }
+opt.on('--width [W]') {|v| $options.width = v.to_i }
+opt.on('--height [H]') {|v| $options.height = v.to_i }
+opt.parse!
+
+#require 'ruby-prof'
+#profile = RubyProf::Profile.new
+
+f = File.open($options.wasm_file)
+data = IO.read($options.source)
+orig = Base64.encode64(data).gsub(/(\r|\n)/, "")
+data_url = "data:image/png;base64," + orig
+instance = Wardite::BinaryLoader::load_from_buffer(f);
+instance.store.memories[0].grow(data_url.size / (64*1024) + 1)
+
+start = instance.exports.__heap_base.value.value
+instance.store.memories[0].data[start...(start+data_url.size)] = data_url
+
+offset = 0
+result = nil
+begin
+  # pub fn grayscale(width: i32, height: i32, memory_offset: i32, length: i32) -> *const u8
+  #profile.start
+  offset = instance.runtime.grayscale_blob($options.width, $options.height, start, data_url.size)
+  #result = profile.stop
+rescue => e
+  raise "failed to execute grayscale() " + e.message
+end
+
+#printer = RubyProf::GraphPrinter.new(result)
+#printer.print(STDOUT, {})
+
+len = 0
+until instance.store.memories[0].data[offset.value+len] == "\0"
+  len += 1
+end
+
+result_b64 = instance.store.memories[0].data[offset.value...(offset.value+len)]
+result = Base64.decode64(result_b64)
+
+dest = File.open($options.dest, "w")
+dest.write result
+dest.close
+
+puts "created: #{$options.dest}"
+

data/lib/wardite/instruction.rb

@@ -78,6 +78,8 @@ module Wardite
     # TODO: add types of potential operands
     attr_accessor :operand #: Array[operandItem]
 
+    attr_accessor :meta #: Hash[Symbol, Integer]
+
     # @rbs namespace: Symbol
     # @rbs code: Symbol
     # @rbs operand: Array[operandItem]
@@ -85,6 +87,7 @@ module Wardite
       @namespace = namespace      
       @code = code
       @operand = operand
+      @meta = {}
     end
 
     # @rbs chr: String

data/lib/wardite/load.rb

@@ -1,4 +1,6 @@
 # rbs_inline: enabled
+require "wardite/revisitor"
+
 module Wardite
   class Section
     attr_accessor :name #: String
@@ -593,10 +595,13 @@ module Wardite
           locals_type << Op.i2type(value_type || -1)
         end
         body = code_body(cbuf)
+        revisitor = Revisitor.new(body)
+        revisitor.revisit!
+        
         dest.func_codes << CodeSection::CodeBody.new do |b|
           b.locals_count = locals_count
           b.locals_type = locals_type
-          b.body = body
+          b.body = revisitor.ops
         end
       end
       dest

data/lib/wardite/revisitor.rb

@@ -0,0 +1,92 @@
+# rbs_inline: enabled
+module Wardite
+  class Revisitor
+    attr_accessor :ops #: Array[Op]
+    
+    # @rbs ops: Array[Op]
+    # @rbs return: void
+    def initialize(ops)
+      @ops = ops
+    end
+
+    # @rbs return: void
+    def revisit!
+      @ops.each_with_index do |op, idx|
+        case op.code
+        when :block
+          next_pc = fetch_ops_while_end(idx)
+          op.meta[:end_pos] = next_pc
+  
+        when :loop
+          next_pc = fetch_ops_while_end(idx)
+          op.meta[:end_pos] = next_pc
+  
+        when :if
+          next_pc = fetch_ops_while_end(idx)
+          else_pc = fetch_ops_while_else_or_end(idx)
+          op.meta[:end_pos] = next_pc
+          op.meta[:else_pos] = else_pc
+        end
+      end
+    end
+
+    # @rbs pc_start: Integer
+    # @rbs return: Integer
+    # @rbs return: void
+    def fetch_ops_while_else_or_end(pc_start)
+      cursor = pc_start
+      depth = 0
+      loop {
+        cursor += 1
+        inst = @ops[cursor]
+        case inst&.code
+        when nil
+          raise EvalError, "end op not found"
+        when :if
+          depth += 1
+        when :else
+          if depth == 0
+            return cursor
+          end
+          # do not touch depth
+        when :end
+          if depth == 0
+            return cursor
+          else
+            depth -= 1
+          end
+        else
+          # nop
+        end
+      }
+      raise "not found corresponding end"
+    end
+
+    # @rbs pc_start: Integer
+    # @rbs return: Integer
+    # @rbs return: void
+    def fetch_ops_while_end(pc_start)
+      cursor = pc_start
+      depth = 0
+      loop {
+        cursor += 1
+        inst = @ops[cursor]
+        case inst&.code
+        when nil
+          raise EvalError, "end op not found"
+        when :if, :block, :loop
+          depth += 1
+        when :end
+          if depth == 0
+            return cursor
+          else
+            depth -= 1
+          end
+        else
+          # nop
+        end
+      }
+      raise "not found corresponding end"
+    end
+  end
+end

data/lib/wardite/version.rb

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module Wardite
-  VERSION = "0.5.0" #: String
+  VERSION = "0.5.1" #: String
 end

data/lib/wardite.rb

@@ -473,7 +473,7 @@ module Wardite
       when :block
         block = insn.operand[0]
         raise EvalError, "block op without block" if !block.is_a?(Block)
-        next_pc = fetch_ops_while_end(frame.body, frame.pc)
+        next_pc = insn.meta[:end_pos]
         label = Label.new(:block, next_pc, stack.size, block.result_size)
         frame.labels.push(label)
 
@@ -481,19 +481,19 @@ module Wardite
         block = insn.operand[0]
         raise EvalError, "loop op without block" if !block.is_a?(Block)
         start = frame.pc
-        end_pc = fetch_ops_while_end(frame.body, frame.pc)
-        label = Label.new(:loop, end_pc, stack.size, block.result_size, start)
+        next_pc = insn.meta[:end_pos]
+        label = Label.new(:loop, next_pc, stack.size, block.result_size, start)
         frame.labels.push(label)
 
       when :if
         block = insn.operand[0]
         raise EvalError, "if op without block" if !block.is_a?(Block)
-        cond = stack.pop 
+        cond = stack.pop
         raise EvalError, "cond not found" if !cond.is_a?(I32)
-        next_pc = fetch_ops_while_end(frame.body, frame.pc)
+        next_pc = insn.meta[:end_pos]
 
         if cond.value.zero?
-          frame.pc = fetch_ops_while_else_or_end(frame.body, frame.pc)
+          frame.pc = insn.meta[:else_pos]
         end
 
         if frame.pc == next_pc
@@ -740,38 +740,6 @@ module Wardite
       raise e
     end
 
-    # @rbs ops: Array[Op]
-    # @rbs pc_start: Integer
-    # @rbs return: Integer
-    def fetch_ops_while_else_or_end(ops, pc_start)
-      cursor = pc_start
-      depth = 0
-      loop {
-        cursor += 1
-        inst = ops[cursor]
-        case inst&.code
-        when nil
-          raise EvalError, "end op not found"
-        when :if
-          depth += 1
-        when :else
-          if depth == 0
-            return cursor
-          end
-          # do not touch depth
-        when :end
-          if depth == 0
-            return cursor
-          else
-            depth -= 1
-          end
-        else
-          # nop
-        end
-      }
-      raise "[BUG] unreachable"
-    end
-
     # @rbs labels: Array[Label]
     # @rbs stack: Array[wasmValue]
     # @rbs level: Integer
@@ -797,33 +765,6 @@ module Wardite
       pc
     end
 
-    # @rbs ops: Array[Op]
-    # @rbs pc_start: Integer
-    # @rbs return: Integer
-    def fetch_ops_while_end(ops, pc_start)
-      cursor = pc_start
-      depth = 0
-      loop {
-        cursor += 1
-        inst = ops[cursor]
-        case inst&.code
-        when nil
-          raise EvalError, "end op not found"
-        when :if, :block, :loop
-          depth += 1
-        when :end
-          if depth == 0
-            return cursor
-          else
-            depth -= 1
-          end
-        else
-          # nop
-        end
-      }
-      raise "[BUG] unreachable"
-    end
-
     # unwind the stack and put return value if exists
     # @rbs sp: Integer
     # @rbs arity: Integer

data/sig/generated/wardite/instruction.rbs

@@ -22,6 +22,8 @@ module Wardite
     # TODO: add types of potential operands
     attr_accessor operand: Array[operandItem]
 
+    attr_accessor meta: Hash[Symbol, Integer]
+
     # @rbs namespace: Symbol
     # @rbs code: Symbol
     # @rbs operand: Array[operandItem]

data/sig/generated/wardite/load.rbs

@@ -1,6 +1,5 @@
 # Generated from lib/wardite/load.rb with RBS::Inline
 
-# rbs_inline: enabled
 module Wardite
   class Section
     attr_accessor name: String

data/sig/generated/wardite/revisitor.rbs

@@ -0,0 +1,25 @@
+# Generated from lib/wardite/revisitor.rb with RBS::Inline
+
+# rbs_inline: enabled
+module Wardite
+  class Revisitor
+    attr_accessor ops: Array[Op]
+
+    # @rbs ops: Array[Op]
+    # @rbs return: void
+    def initialize: (Array[Op] ops) -> void
+
+    # @rbs return: void
+    def revisit!: () -> void
+
+    # @rbs pc_start: Integer
+    # @rbs return: Integer
+    # @rbs return: void
+    def fetch_ops_while_else_or_end: (Integer pc_start) -> Integer
+
+    # @rbs pc_start: Integer
+    # @rbs return: Integer
+    # @rbs return: void
+    def fetch_ops_while_end: (Integer pc_start) -> Integer
+  end
+end

data/sig/generated/wardite.rbs

@@ -115,22 +115,12 @@ module Wardite
     # @rbs return: void
     def eval_insn: (Frame frame, Op insn) -> void
 
-    # @rbs ops: Array[Op]
-    # @rbs pc_start: Integer
-    # @rbs return: Integer
-    def fetch_ops_while_else_or_end: (Array[Op] ops, Integer pc_start) -> Integer
-
     # @rbs labels: Array[Label]
     # @rbs stack: Array[wasmValue]
     # @rbs level: Integer
     # @rbs return: Integer
     def do_branch: (Array[Label] labels, Array[wasmValue] stack, Integer level) -> Integer
 
-    # @rbs ops: Array[Op]
-    # @rbs pc_start: Integer
-    # @rbs return: Integer
-    def fetch_ops_while_end: (Array[Op] ops, Integer pc_start) -> Integer
-
     # unwind the stack and put return value if exists
     # @rbs sp: Integer
     # @rbs arity: Integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wardite
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Uchio Kondo
@@ -31,6 +31,7 @@ files:
 - examples/fib.wat
 - examples/fib2.wat
 - examples/global.wat
+- examples/grayscale.rb
 - examples/helloworld.wat
 - examples/i32_const.wat
 - examples/i32_store.wat
@@ -53,6 +54,7 @@ files:
 - lib/wardite/instruction.rb
 - lib/wardite/leb128.rb
 - lib/wardite/load.rb
+- lib/wardite/revisitor.rb
 - lib/wardite/value.rb
 - lib/wardite/version.rb
 - lib/wardite/wasi.rb
@@ -71,6 +73,7 @@ files:
 - sig/generated/wardite/instruction.rbs
 - sig/generated/wardite/leb128.rbs
 - sig/generated/wardite/load.rbs
+- sig/generated/wardite/revisitor.rbs
 - sig/generated/wardite/value.rbs
 - sig/generated/wardite/version.rbs
 - sig/generated/wardite/wasi.rbs