ruby_abc 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53a8e79cf40c11f4fb22f3d5a1e55763de58a763
-  data.tar.gz: 353361f5895d90f4acb08db4b5234e1a3fc0b553
+  metadata.gz: 9fd5883ec3a3da72ba747cc3de5d52f7dc467b66
+  data.tar.gz: e6d50ed52c1ac424870f97e40314eb466c989d26
 SHA512:
-  metadata.gz: 69d80d3aa276f0dc302a6e750bad0751a8f8b04426846d6f1763a58061aa5e67a66a07b2d09d86268766497fd85bcedff9f49cb688ab92bd9ede790b1254bc9b
-  data.tar.gz: f1f182e8071c7f8a526b0d7cc93491cb0945a9ae6b87eceb4992bbb788033f40bd3e98febbd2f599c9aebea291f4fbe2b7f707b3fa25eed449332c81c8272548
+  metadata.gz: adaebecb0852ab57632b491da54a02fca3e2eb89ff3cae799847a69df248e5214a27c8447b62d7c277de478c146fb7aeca4830ea4611936067061bfcacae55d4
+  data.tar.gz: 86df84083bec60c1f1e74998dd20dd387d02956c2546a5c3ec049febf56363e9f5180654ea59749166f6cedced47c2065c5f057a3ade3085f2279646473bc201

data/Rakefile

@@ -38,7 +38,7 @@ desc 'compile libabc.so and abc'
 task libabc => abcsrc do
 	abort "Library libpthread was not found" if !have_library('pthread')
 	abort "Library libdl was not found"      if !have_library('dl')
-	abort "Library librt was not found"      if !have_library('rt')
+	#abort "Library librt was not found"      if !have_library('rt') ## librt.a is not on Mac OS
 	wd = Dir.getwd
 	Dir.chdir(abc_path)
 	sh "make -j4 ABC_USE_PIC=true OPTFLAGS='-O2' ABC_USE_NO_READLINE=true libabc.so"

data/bin/ruby_abc

@@ -3,49 +3,61 @@
 require 'ruby_abc'
 require 'optparse'
 
+STDOUT.sync = true
+
 options = {}
 
 optparse = OptionParser.new do |opts|
 	opts.banner = "Usage: #{File.basename(__FILE__)} [options] -i <input_file> -o <output_file>"
 
 	options[:inputFileName] = nil
-	opts.on('-i', '--input FILE', 'Input file name') do |file|
+	opts.on('-i', '--input FILE', 'Input file') do |file|
 		options[:inputFileName] = file
 	end
 
 	options[:outputFileName] = nil
-	opts.on('-o', '--output FILE', 'Output file name') do |file|
+	opts.on('-o', '--output FILE', 'Write processed netlist to FILE') do |file|
 		options[:outputFileName] = file
 	end
 
+	options[:sweep] = false
+	opts.on('-s', '--sweep', 'Sweep logic network to remove dangling nodes') do
+		options[:sweep] = true
+	end
+
+	options[:k] = nil
+	opts.on('-k', '--lut_inputs K', "Map to K-input LUTs.") do |k|
+		options[:k] = k.to_i
+	end
+
+	options[:area] = false
+	opts.on('-a', '--area', 'Optimize in area') do
+		options[:area] = true
+	end
+
 	options[:retime] = false
 	opts.on('-r', '--retime', 'Retime netlist') do
 		options[:retime] = true
 	end
 
-	options[:zero] = false
-	opts.on('-z', '--zero', 'Set latches initial value to zero') do
-		options[:zero] = true
-	end
-
 	options[:lcorr] = false
 	opts.on('-l', '--lcorr', 'Computes latch correspondence using 1-step induction') do
 		options[:lcorr] = true
 	end
 
-	options[:area] = false
-	opts.on('-a', '--area', 'Optimize in area') do
-		options[:area] = true
+	options[:zero] = false
+	opts.on('-z', '--zero', 'Set latches initial value to zero') do
+		options[:zero] = true
 	end
 
-	options[:sweep] = false
-	opts.on('-w', '--sweep', 'Sweep logic network to remove dangling nodes') do
-		options[:sweep] = true
+	options[:echo] = false
+	opts.on('-e', '--echo', 'Echo commands sent to ABC') do
+		options[:echo] = true
 	end
 
-	options[:k] = nil
-	opts.on('-k', '--lut_inputs K', "Map to K-input LUTs.") do |k|
-		options[:k] = k.to_i
+	options[:quiet] = false
+	opts.on('-q', '--quiet', 'Do not print netlist statistics during synthesis') do
+		options[:quiet] = true
 	end
 
 	opts.on( '-h', '--help', 'Display this help' ) do
@@ -58,6 +70,8 @@ optparse.parse!
 
 abort "Missing input file name.\n#{optparse}" if options[:inputFileName].nil?
 
+ABC::echo_commands = not(not(options[:echo]))
+
 ABC::synthesis(
 	input:   options[:inputFileName], 
 	output:  options[:outputFileName], 
@@ -66,6 +80,7 @@ ABC::synthesis(
 	retime:  options[:retime], 
 	lcorr:   options[:lcorr], 
 	area:    options[:area], 
-	lut_map: options[:k]
+	lut_map: options[:k],
+	verbose: not(options[:quiet])
 )
 

data/ext/ruby_abc.c

@@ -137,10 +137,15 @@ static VALUE rubyabc_n_levels(VALUE self)
  */
 static VALUE rubyabc_run_command(VALUE self, VALUE cmd)
 {
+	VALUE printed_str;
+
 	Check_Type(cmd, T_STRING);
 
-	if (rubyabc_echo_commands)
-		rb_io_puts(1, &cmd, rb_stdout);
+
+	if (rubyabc_echo_commands) {
+		printed_str = rb_sprintf("Command: \"%"PRIsVALUE"\"", cmd);
+		rb_io_puts(1, &printed_str, rb_stdout);
+	}
 
 	if (rubyabc_c_run_command(StringValueCStr(cmd)))
 		return Qfalse;

data/lib/ruby_abc.rb

@@ -4,7 +4,7 @@ require_relative 'ruby_abc/ruby_abc.so'
 
 
 module ABC
-	VERSION = '0.0.4'
+	VERSION = '0.0.6'
 
 	##
 	# call-seq:
@@ -36,15 +36,15 @@ module ABC
 		puts "Outputs: ..#{(' ' + n_pos.to_s).rjust(max_len, '.')}"     if n_pos
 		puts "Nodes: ....#{(' ' + n_nodes.to_s).rjust(max_len, '.')}"   if n_nodes
 		puts "Latches: ..#{(' ' + n_latches.to_s).rjust(max_len, '.')}" if n_latches
-		puts "Levels: ...#{(' ' + n_levels.to_s).rjust(max_len, '.')}"  if n_levels
 		puts "And gates: #{(' ' + n_ands.to_s).rjust(max_len, '.')}"    if n_ands
+		puts "Levels: ...#{(' ' + n_levels.to_s).rjust(max_len, '.')}"  if n_levels
 		return nil
 	end # ABC::print_stats
 
 
 	##
 	# call-seq:
-	# optimize -> nb_ands
+	# optimize (verbose: true) -> nb_ands
 	#
 	# Combinatorial synthesis of the network. 
 	# This method loops the command "resyn; resyn2, resyn3, print_stats" and stops when the number of AND gates stop decreasing.
@@ -58,10 +58,11 @@ module ABC
 	#
 	#  ABC.optimize
 	#
-	def self.optimize
+	def self.optimize (verbose: true)
+		cmd = 'resyn; resyn2; resyn3' + (verbose ? '; ps' : '')
 		n_ands = ABC::nb_ands
 		loop do
-			ABC::run_command('resyn; resyn2; resyn3; ps')
+			ABC::run_command(cmd)
 			new_n_ands = ABC::nb_ands
 			break unless new_n_ands < n_ands
 			n_ands = new_n_ands
@@ -72,19 +73,19 @@ module ABC
 
 	##
 	# call-seq:
-	# map (lut_size, optimize_for_area = false) -> nb_nodes
+	# map (lut_size, optimize_for_area = false, verbose: true) -> nb_nodes
 	#
 	# Map the logic network to nodes with at most +lut_size+ inputs.
 	# If +optimize_for_area+ is true, minimize the number of nodes instead of minimizing the logic level of the network.
 	#
 	# This method loops the command: 
-	#  "choice; if -K #{lut_size}#{optimize_for_area ? ' -a':''}; ps"
+	#  "choice2; if -K #{lut_size}#{optimize_for_area ? ' -a':''}; ps"
 	# and stops when the number of nodes stop decreasing.
 	#
 	#  ABC.map(4)
 	#
-	def self.map (k, optimize_area = false)
-		map_cmd = "choice; if -K #{k}#{optimize_area ? ' -a':''}; ps"
+	def self.map (k, optimize_area = false, verbose: true)
+		map_cmd = "choice2; if -K #{k}#{optimize_area ? ' -a':''}#{verbose ? '; ps':''}"
 
 		n_nodes = -1
 		loop do
@@ -117,7 +118,7 @@ module ABC
 
 	##
 	# call-seq:
-	# synthesis (input: nil, output: nil, zero: false, sweep: false, retime: false, lcorr: false, area: false, lut_map: nil, help: nil)
+	# synthesis (input: nil, output: nil, zero: false, sweep: false, retime: false, lcorr: false, area: false, lut_map: nil, verbose: true, help: nil)
 	#
 	# This method is an atempt to automate the logic synthesis process (combinatorial and sequential) according to some parameters.
 	#
@@ -133,7 +134,7 @@ module ABC
 	#
 	#  ABC.synthesis(input: 'generic.blif', output: 'maped.blif', lcorr: true, lut_map: 4, area: true)
 	#
-	def self.synthesis(input: nil, output: nil, zero: false, sweep: false, retime: false, lcorr: false, area: false, lut_map: nil, help: nil)
+	def self.synthesis(input: nil, output: nil, zero: false, sweep: false, retime: false, lcorr: false, area: false, lut_map: nil, help: nil, verbose: true)
 		if help then
 			puts <<EOS
 ABC::synthesis keyword arguments:
@@ -158,7 +159,7 @@ EOS
 		ABC::print_stats
 		puts "-----------------------"
 
-		ABC::ps
+		ABC::ps if verbose
 
 		if sweep then
 			ABC::sweep
@@ -166,43 +167,47 @@ EOS
 		end
 
 		if zero and ABC::nb_latches > 0 then
-			ABC::run_command 'strash; zero; ps'
+			ABC::run_command 'strash; zero'
 		else
-			ABC::run_command 'strash; ps'
+			ABC::run_command 'strash'
 		end
+		ABC::ps if verbose
 
 		ABC::lcorr if (lcorr and ABC::nb_latches > 0)
 
 		if sweep then
 			ABC::ssweep
 			ABC::csweep
-			ABC::ps
+			ABC::ps if verbose
 		end
 
-		ABC::optimize
+		ABC::optimize(verbose: verbose)
 
 		if retime and ABC::nb_latches > 0 then
 			level = ABC::nb_levels
-			ABC::run_command('retime; strash; ps')
+			ABC::run_command('retime; strash')
+			ABC::ps if verbose
 			if ABC::nb_levels >= level then
-				ABC::run_command('dretime; strash; ps')
+				ABC::run_command('dretime; strash')
+				ABC::ps if verbose
 			end
-			ABC::optimize
+			ABC::optimize(verbose: verbose)
 		end
 
 		ABC::zero if zero
 
 		if lut_map then
 			raise "Expecting a strictly positive integer for argument :lut_map" unless (lut_map.kind_of?(Integer) and lut_map > 0)
-			ABC::map(lut_map, not(not(area)))
+			ABC::map(lut_map, not(not(area)), verbose: verbose)
 		end
 
 		if sweep then
-			ABC::run_command 'sop; sweep; resyn; resyn2; resyn3; scleanup; resyn; scleanup; scleanup; scleanup; strash; ssweep; csweep; ps'
-			ABC::optimize
+			ABC::run_command 'sop; sweep; resyn; resyn2; resyn3; scleanup; resyn; scleanup; scleanup; scleanup; strash; ssweep; csweep'
+			ABC::ps if verbose
+			ABC::optimize(verbose: verbose)
 			if lut_map then
 				raise "Expecting a strictly positive integer for argument :lut_map" unless (lut_map.kind_of?(Integer) and lut_map > 0)
-				ABC::map(lut_map, not(not(area)))
+				ABC::map(lut_map, not(not(area)), verbose: verbose)
 			end
 		end
 
@@ -210,7 +215,7 @@ EOS
 			ABC::run_command 'strash; lcorr'
 			if lut_map then
 				raise "Expecting a strictly positive integer for argument :lut_map" unless (lut_map.kind_of?(Integer) and lut_map > 0)
-				ABC::map(lut_map, not(not(area)))
+				ABC::map(lut_map, not(not(area)), verbose: verbose)
 			end
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_abc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Théotime Bollengier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies: []
 description: |-
   ruby_abc is a ruby C extension intended to allow the use of ABC from Ruby.