Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: azonenberg/yosys
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ac90de73beca
Choose a base ref
...
head repository: azonenberg/yosys
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0c83a30f950d
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 8, 2017

  1. Updated ABC to hg id 38b26a543f1d

    @cliffordwolf
    cliffordwolf committed Jan 8, 2017
    Copy the full SHA
    8012de4 View commit details

Commits on Jan 11, 2017

  1. Update ABC to hg id f8cadfe3861f

    @cliffordwolf
    cliffordwolf committed Jan 11, 2017
    Copy the full SHA
    8953a55 View commit details

  2. Fix $initstate handling bug in yosys-smtbmc

    @cliffordwolf
    cliffordwolf committed Jan 11, 2017
    Copy the full SHA
    b7cfb7d View commit details

Commits on Jan 15, 2017

  1. Fix bug in AstNode::mem2reg_as_needed_pass2()

    @cliffordwolf
    cliffordwolf committed Jan 15, 2017
    Copy the full SHA
    78f65f8 View commit details

  2. Merge https://github.com/cliffordwolf/yosys

    @azonenberg
    azonenberg committed Jan 15, 2017
    Copy the full SHA
    0c83a30 View commit details
Showing with 7 additions and 3 deletions.
  1. +3 −3 Makefile
  2. +2 −0 backends/smt2/smtbmc.py
  3. +2 −0 frontends/ast/simplify.cc
6 changes: 3 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ OBJS = kernel/version_$(GIT_REV).o
# is just a symlink to your actual ABC working directory, as 'make mrproper'
# will remove the 'abc' directory and you do not want to accidentally
# delete your work on ABC..
ABCREV = 55cd83f432c0
ABCREV = f8cadfe3861f
ABCPULL = 1
ABCURL ?= https://bitbucket.org/alanmi/abc
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"
@@ -174,7 +174,7 @@ CXXFLAGS += -std=c++11 -Os -D_POSIX_SOURCE
CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s
LDLIBS := $(filter-out -lrt,$(LDLIBS))
ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC -x c++ -fpermissive -w"
ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC -fpermissive -w"
ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=1 CC="$(CXX)" CXX="$(CXX)"
EXE = .exe

@@ -185,7 +185,7 @@ CXXFLAGS += -std=c++11 -Os -D_POSIX_SOURCE -DYOSYS_WIN32_UNIX_DIR
CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s
LDLIBS := $(filter-out -lrt,$(LDLIBS))
ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC -x c++ -fpermissive -w"
ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC -fpermissive -w"
ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=0 CC="$(CXX)" CXX="$(CXX)"
EXE = .exe

2 changes: 2 additions & 0 deletions backends/smt2/smtbmc.py
View file
Original file line number Diff line number Diff line change
@@ -789,6 +789,7 @@ def print_anyconsts(state):
for i in range(1, step_size):
if step+i < num_steps:
smt.write("(declare-fun s%d () |%s_s|)" % (step+i, topmod))
smt.write("(assert (not (|%s_is| s%d)))" % (topmod, step+i))
smt.write("(assert (|%s_u| s%d))" % (topmod, step+i))
smt.write("(assert (|%s_h| s%d))" % (topmod, step+i))
smt.write("(assert (|%s_t| s%d s%d))" % (topmod, step+i-1, step+i))
@@ -812,6 +813,7 @@ def print_anyconsts(state):
for i in range(last_check_step+1, last_check_step+1+append_steps):
print_msg("Appending additional step %d." % i)
smt.write("(declare-fun s%d () |%s_s|)" % (i, topmod))
smt.write("(assert (not (|%s_is| s%d)))" % (topmod, i))
smt.write("(assert (|%s_u| s%d))" % (topmod, i))
smt.write("(assert (|%s_h| s%d))" % (topmod, i))
smt.write("(assert (|%s_t| s%d s%d))" % (topmod, i-1, i))
2 changes: 2 additions & 0 deletions frontends/ast/simplify.cc
View file
Original file line number Diff line number Diff line change
@@ -3079,6 +3079,8 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,

if (bit_part_sel)
children.push_back(bit_part_sel);

did_something = true;
}

log_assert(id2ast == NULL || mem2reg_set.count(id2ast) == 0);