Commit 2e7e9ef

authored

Merge pull request #65 from antmicro/merge-upstream

Merge upstream and fix merge error

2 parents b95cfd6 + 7eda868 commit 2e7e9efCopy full SHA for 2e7e9ef

101 files changed

+28075

-1305

lines changed

ODIN_II
doc/src
- tutorials/arch/timing_modeling
  - index.rst
- vpr
  - command_line_usage.rst
libs/libarchfpga/src
- cad_types.h
- read_xml_arch_file.cpp
vpr/src
- base
- pack
- place
  - place.cpp
- route
  - route_tree_timing.cpp
vtr_flow
- arch
  - timing
    - k6_frac_N10_4add_2chains_tie_off_depop50_mem20K_22nm.xml
  - titan
    - stratixiv_arch.timing.xml
- benchmarks
  - arithmetic/multipliers
  - titan_other_blif
    - ucsb_152_tap_fir_stratixiv_arch_timing.blif
- scripts
  - download_titan.py
- tasks/regression_tests
  - vtr_reg_nightly
    - titan_other/config
      - config.txt
      - golden_results.txt
    - titan_small/config
      - config.txt
      - golden_results.txt
  - vtr_reg_strong
    - strong_cin_tie_off/config
      - config.txt
      - golden_results.txt
    - strong_soft_multipliers/config
      - config.txt
      - golden_results.txt
    - strong_titan/config
      - config.txt
      - golden_results.txt
    - task_list.txt
  - vtr_reg_weekly/vtr_reg_titan/config
    - config.txt
    - golden_results.txt

101 files changed

+28075

-1305

lines changed

`‎ODIN_II/.gitignore`

-Original file line number
+Diff line change
 temp
 regression_test/latest
 *_preproc.v
 -default_out.blif
 +default_out.blif
 +*.dot

Comments

(0)