diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-05-23 13:37:53 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-05-23 13:37:53 -0700 |
| commit | 68359bcd6f1ded0dffa12f0d1e2288e433fd83e7 (patch) | |
| tree | 6cbf1976a4a7ca510e7330c8f6d09603d9dc9446 /libs/subcircuit/subcircuit.cc | |
| parent | ae89e6ab26d2d87a604e20ebc14dcda8c9901585 (diff) | |
| parent | 5ac7e38d0aab1c73150accd9befbccc5398b8e42 (diff) | |
| download | yosys-68359bcd6f1ded0dffa12f0d1e2288e433fd83e7.tar.gz yosys-68359bcd6f1ded0dffa12f0d1e2288e433fd83e7.tar.bz2 yosys-68359bcd6f1ded0dffa12f0d1e2288e433fd83e7.zip | |
Merge remote-tracking branch 'origin/eddie/opt_rmdff' into xc7mux
Diffstat (limited to 'libs/subcircuit/subcircuit.cc')
| -rw-r--r-- | libs/subcircuit/subcircuit.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libs/subcircuit/subcircuit.cc b/libs/subcircuit/subcircuit.cc index 7c7236833..e8361a67e 100644 --- a/libs/subcircuit/subcircuit.cc +++ b/libs/subcircuit/subcircuit.cc @@ -320,12 +320,10 @@ class SubCircuit::SolverWorker static int numberOfPermutations(const std::vector<std::string> &list) { - int numPermutations = 1; - for (int i = 0; i < int(list.size()); i++) { - assert(numPermutations < maxPermutationsLimit); - numPermutations *= i+1; - } - return numPermutations; + constexpr size_t mappedPermutationsSize = 10; + constexpr int mappedPermutations[mappedPermutationsSize] = {1, 1, 2, 6, 24, 120, 720, 5040, 40320, 362880}; + assert(list.size() < mappedPermutationsSize); + return mappedPermutations[list.size()]; } static void permutateVectorToMap(std::map<std::string, std::string> &map, const std::vector<std::string> &list, int idx) |