Skip to content

Commit d173cb3

Browse files
committed
Update the bazel BUILD (and clean new warnings)
Signed-off-by: Matt Liberty <[email protected]>
1 parent d9c954c commit d173cb3

File tree

5 files changed

+217
-9
lines changed

5 files changed

+217
-9
lines changed

BUILD

Lines changed: 204 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ cc_library(
105105
"src/aig/gia/giaBalLut.c",
106106
"src/aig/gia/giaBalMap.c",
107107
"src/aig/gia/giaBidec.c",
108+
"src/aig/gia/giaBsFind.c",
108109
"src/aig/gia/giaBound.c",
109110
"src/aig/gia/giaCCof.c",
110111
"src/aig/gia/giaCex.c",
@@ -119,6 +120,7 @@ cc_library(
119120
"src/aig/gia/giaCTas.c",
120121
"src/aig/gia/giaCut.c",
121122
"src/aig/gia/giaDecs.c",
123+
"src/aig/gia/giaDecGraph.cpp",
122124
"src/aig/gia/giaDeep.c",
123125
"src/aig/gia/giaDfs.c",
124126
"src/aig/gia/giaDup.c",
@@ -149,6 +151,7 @@ cc_library(
149151
"src/aig/gia/giaJf.c",
150152
"src/aig/gia/giaKf.c",
151153
"src/aig/gia/giaLf.c",
154+
"src/aig/gia/giaLutCas.c",
152155
"src/aig/gia/giaMan.c",
153156
"src/aig/gia/giaMem.c",
154157
"src/aig/gia/giaMf.c",
@@ -157,6 +160,7 @@ cc_library(
157160
"src/aig/gia/giaMinLut2.c",
158161
"src/aig/gia/giaMinLut.c",
159162
"src/aig/gia/giaMulFind.c",
163+
"src/aig/gia/giaMulFind3.c",
160164
"src/aig/gia/giaMuxes.c",
161165
"src/aig/gia/giaNf.c",
162166
"src/aig/gia/giaOf.c",
@@ -173,6 +177,7 @@ cc_library(
173177
"src/aig/gia/giaResub.c",
174178
"src/aig/gia/giaRetime.c",
175179
"src/aig/gia/giaRex.c",
180+
"src/aig/gia/giaRrr.cpp",
176181
"src/aig/gia/giaSat3.c",
177182
"src/aig/gia/giaSatEdge.c",
178183
"src/aig/gia/giaSatLE.c",
@@ -422,6 +427,7 @@ cc_library(
422427
"src/base/exor/exorUtil.c",
423428
"src/base/io/io.c",
424429
"src/base/io/ioJson.c",
430+
"src/base/io/ioJsonc.c",
425431
"src/base/io/ioReadAiger.c",
426432
"src/base/io/ioReadBaf.c",
427433
"src/base/io/ioReadBblif.c",
@@ -448,6 +454,7 @@ cc_library(
448454
"src/base/io/ioWriteEdgelist.c",
449455
"src/base/io/ioWriteEqn.c",
450456
"src/base/io/ioWriteGml.c",
457+
"src/base/io/ioWriteHMetis.c",
451458
"src/base/io/ioWriteList.c",
452459
"src/base/io/ioWritePla.c",
453460
"src/base/io/ioWriteSmv.c",
@@ -676,6 +683,7 @@ cc_library(
676683
"src/map/if/ifCore.c",
677684
"src/map/if/ifCut.c",
678685
"src/map/if/ifData2.c",
686+
"src/map/if/ifDecJ.c",
679687
"src/map/if/ifDec07.c",
680688
"src/map/if/ifDec08.c",
681689
"src/map/if/ifDec10.c",
@@ -804,11 +812,15 @@ cc_library(
804812
"src/misc/tim/timTime.c",
805813
"src/misc/tim/timTrav.c",
806814
"src/misc/util/utilBridge.c",
815+
"src/misc/util/utilBSet.c",
807816
"src/misc/util/utilCex.c",
808817
"src/misc/util/utilColor.c",
809818
"src/misc/util/utilFile.c",
810819
"src/misc/util/utilIsop.c",
820+
"src/misc/util/utilMiniver.c",
821+
"src/misc/util/utilMulSim.c",
811822
"src/misc/util/utilNam.c",
823+
"src/misc/util/utilPrefix.cpp",
812824
"src/misc/util/utilPth.c",
813825
"src/misc/util/utilSignal.c",
814826
"src/misc/util/utilSort.c",
@@ -867,6 +879,8 @@ cc_library(
867879
"src/opt/dau/dauNpn.c",
868880
"src/opt/dau/dauTree.c",
869881
"src/opt/dsc/dsc.c",
882+
"src/opt/eslim/relationGeneration.cpp",
883+
"src/opt/eslim/eSLIM.cpp",
870884
"src/opt/fret/fretFlow.c",
871885
"src/opt/fret/fretInit.c",
872886
"src/opt/fret/fretMain.c",
@@ -934,6 +948,10 @@ cc_library(
934948
"src/opt/ret/retIncrem.c",
935949
"src/opt/ret/retInit.c",
936950
"src/opt/ret/retLvalue.c",
951+
"src/opt/rar/rewireRng.c",
952+
"src/opt/rar/rewireMap.c",
953+
"src/opt/rar/rewireRar.c",
954+
"src/opt/rar/rewireMiaig.cpp",
937955
"src/opt/rwr/rwrDec.c",
938956
"src/opt/rwr/rwrEva.c",
939957
"src/opt/rwr/rwrExp.c",
@@ -1145,6 +1163,8 @@ cc_library(
11451163
"src/sat/bmc/bmcInse.c",
11461164
"src/sat/bmc/bmcLoad.c",
11471165
"src/sat/bmc/bmcMaj2.c",
1166+
"src/sat/bmc/bmcMaj8.c",
1167+
"src/sat/bmc/bmcMaj7.c",
11481168
"src/sat/bmc/bmcMaj3.c",
11491169
"src/sat/bmc/bmcMaj.c",
11501170
"src/sat/bmc/bmcMaxi.c",
@@ -1166,6 +1186,97 @@ cc_library(
11661186
"src/sat/bsat/satTrace.c",
11671187
"src/sat/bsat/satTruth.c",
11681188
"src/sat/bsat/satUtil.c",
1189+
"src/sat/cadical/cadicalSolver.c",
1190+
"src/sat/cadical/cadicalTest.c",
1191+
"src/sat/cadical/cadical_analyze.cpp",
1192+
"src/sat/cadical/cadical_arena.cpp",
1193+
"src/sat/cadical/cadical_assume.cpp",
1194+
"src/sat/cadical/cadical_averages.cpp",
1195+
"src/sat/cadical/cadical_backtrack.cpp",
1196+
"src/sat/cadical/cadical_backward.cpp",
1197+
"src/sat/cadical/cadical_bins.cpp",
1198+
"src/sat/cadical/cadical_block.cpp",
1199+
"src/sat/cadical/cadical_ccadical.cpp",
1200+
"src/sat/cadical/cadical_checker.cpp",
1201+
"src/sat/cadical/cadical_clause.cpp",
1202+
"src/sat/cadical/cadical_collect.cpp",
1203+
"src/sat/cadical/cadical_compact.cpp",
1204+
"src/sat/cadical/cadical_condition.cpp",
1205+
"src/sat/cadical/cadical_config.cpp",
1206+
"src/sat/cadical/cadical_congruence.cpp",
1207+
"src/sat/cadical/cadical_constrain.cpp",
1208+
"src/sat/cadical/cadical_contract.cpp",
1209+
"src/sat/cadical/cadical_cover.cpp",
1210+
"src/sat/cadical/cadical_decide.cpp",
1211+
"src/sat/cadical/cadical_decompose.cpp",
1212+
"src/sat/cadical/cadical_deduplicate.cpp",
1213+
"src/sat/cadical/cadical_definition.cpp",
1214+
"src/sat/cadical/cadical_drattracer.cpp",
1215+
"src/sat/cadical/cadical_elim.cpp",
1216+
"src/sat/cadical/cadical_elimfast.cpp",
1217+
"src/sat/cadical/cadical_ema.cpp",
1218+
"src/sat/cadical/cadical_extend.cpp",
1219+
"src/sat/cadical/cadical_external.cpp",
1220+
"src/sat/cadical/cadical_external_propagate.cpp",
1221+
"src/sat/cadical/cadical_factor.cpp",
1222+
"src/sat/cadical/cadical_file.cpp",
1223+
"src/sat/cadical/cadical_flags.cpp",
1224+
"src/sat/cadical/cadical_flip.cpp",
1225+
"src/sat/cadical/cadical_format.cpp",
1226+
"src/sat/cadical/cadical_frattracer.cpp",
1227+
"src/sat/cadical/cadical_gates.cpp",
1228+
"src/sat/cadical/cadical_idruptracer.cpp",
1229+
"src/sat/cadical/cadical_instantiate.cpp",
1230+
"src/sat/cadical/cadical_internal.cpp",
1231+
"src/sat/cadical/cadical_ipasir.cpp",
1232+
"src/sat/cadical/cadical_lidruptracer.cpp",
1233+
"src/sat/cadical/cadical_limit.cpp",
1234+
"src/sat/cadical/cadical_logging.cpp",
1235+
"src/sat/cadical/cadical_lookahead.cpp",
1236+
"src/sat/cadical/cadical_lratchecker.cpp",
1237+
"src/sat/cadical/cadical_lrattracer.cpp",
1238+
"src/sat/cadical/cadical_lucky.cpp",
1239+
"src/sat/cadical/cadical_message.cpp",
1240+
"src/sat/cadical/cadical_minimize.cpp",
1241+
"src/sat/cadical/cadical_occs.cpp",
1242+
"src/sat/cadical/cadical_options.cpp",
1243+
"src/sat/cadical/cadical_parse.cpp",
1244+
"src/sat/cadical/cadical_phases.cpp",
1245+
"src/sat/cadical/cadical_probe.cpp",
1246+
"src/sat/cadical/cadical_profile.cpp",
1247+
"src/sat/cadical/cadical_proof.cpp",
1248+
"src/sat/cadical/cadical_propagate.cpp",
1249+
"src/sat/cadical/cadical_queue.cpp",
1250+
"src/sat/cadical/cadical_random.cpp",
1251+
"src/sat/cadical/cadical_reap.cpp",
1252+
"src/sat/cadical/cadical_reduce.cpp",
1253+
"src/sat/cadical/cadical_rephase.cpp",
1254+
"src/sat/cadical/cadical_report.cpp",
1255+
"src/sat/cadical/cadical_resources.cpp",
1256+
"src/sat/cadical/cadical_restart.cpp",
1257+
"src/sat/cadical/cadical_restore.cpp",
1258+
"src/sat/cadical/cadical_score.cpp",
1259+
"src/sat/cadical/cadical_shrink.cpp",
1260+
"src/sat/cadical/cadical_signal.cpp",
1261+
"src/sat/cadical/cadical_solution.cpp",
1262+
"src/sat/cadical/cadical_solver.cpp",
1263+
"src/sat/cadical/cadical_stable.cpp",
1264+
"src/sat/cadical/cadical_stats.cpp",
1265+
"src/sat/cadical/cadical_subsume.cpp",
1266+
"src/sat/cadical/cadical_sweep.cpp",
1267+
"src/sat/cadical/cadical_terminal.cpp",
1268+
"src/sat/cadical/cadical_ternary.cpp",
1269+
"src/sat/cadical/cadical_tier.cpp",
1270+
"src/sat/cadical/cadical_transred.cpp",
1271+
"src/sat/cadical/cadical_unstable.cpp",
1272+
"src/sat/cadical/cadical_util.cpp",
1273+
"src/sat/cadical/cadical_var.cpp",
1274+
"src/sat/cadical/cadical_veripbtracer.cpp",
1275+
"src/sat/cadical/cadical_version.cpp",
1276+
"src/sat/cadical/cadical_vivify.cpp",
1277+
"src/sat/cadical/cadical_walk.cpp",
1278+
"src/sat/cadical/cadical_watch.cpp",
1279+
"src/sat/cadical/cadical_kitten.c",
11691280
"src/sat/cnf/cnfCore.c",
11701281
"src/sat/cnf/cnfCut.c",
11711282
"src/sat/cnf/cnfData.c",
@@ -1188,6 +1299,97 @@ cc_library(
11881299
"src/sat/glucose/Options.cpp",
11891300
"src/sat/glucose/SimpSolver.cpp",
11901301
"src/sat/glucose/System.cpp",
1302+
"src/sat/kissat/kissatSolver.c",
1303+
"src/sat/kissat/kissatTest.c",
1304+
"src/sat/kissat/allocate.c",
1305+
"src/sat/kissat/analyze.c",
1306+
"src/sat/kissat/ands.c",
1307+
"src/sat/kissat/arena.c",
1308+
"src/sat/kissat/assign.c",
1309+
"src/sat/kissat/averages.c",
1310+
"src/sat/kissat/backbone.c",
1311+
"src/sat/kissat/backtrack.c",
1312+
"src/sat/kissat/build.c",
1313+
"src/sat/kissat/bump.c",
1314+
"src/sat/kissat/check.c",
1315+
"src/sat/kissat/classify.c",
1316+
"src/sat/kissat/clause.c",
1317+
"src/sat/kissat/collect.c",
1318+
"src/sat/kissat/colors.c",
1319+
"src/sat/kissat/compact.c",
1320+
"src/sat/kissat/config.c",
1321+
"src/sat/kissat/congruence.c",
1322+
"src/sat/kissat/decide.c",
1323+
"src/sat/kissat/deduce.c",
1324+
"src/sat/kissat/definition.c",
1325+
"src/sat/kissat/dense.c",
1326+
"src/sat/kissat/dump.c",
1327+
"src/sat/kissat/eliminate.c",
1328+
"src/sat/kissat/equivalences.c",
1329+
"src/sat/kissat/error.c",
1330+
"src/sat/kissat/extend.c",
1331+
"src/sat/kissat/factor.c",
1332+
"src/sat/kissat/fastel.c",
1333+
"src/sat/kissat/file.c",
1334+
"src/sat/kissat/flags.c",
1335+
"src/sat/kissat/format.c",
1336+
"src/sat/kissat/forward.c",
1337+
"src/sat/kissat/gates.c",
1338+
"src/sat/kissat/heap.c",
1339+
"src/sat/kissat/ifthenelse.c",
1340+
"src/sat/kissat/import.c",
1341+
"src/sat/kissat/internal.c",
1342+
"src/sat/kissat/kimits.c",
1343+
"src/sat/kissat/kitten.c",
1344+
"src/sat/kissat/krite.c",
1345+
"src/sat/kissat/learn.c",
1346+
"src/sat/kissat/logging.c",
1347+
"src/sat/kissat/kucky.c",
1348+
"src/sat/kissat/minimize.c",
1349+
"src/sat/kissat/mode.c",
1350+
"src/sat/kissat/kptions.c",
1351+
"src/sat/kissat/phases.c",
1352+
"src/sat/kissat/preprocess.c",
1353+
"src/sat/kissat/print.c",
1354+
"src/sat/kissat/probe.c",
1355+
"src/sat/kissat/profile.c",
1356+
"src/sat/kissat/promote.c",
1357+
"src/sat/kissat/proof.c",
1358+
"src/sat/kissat/propbeyond.c",
1359+
"src/sat/kissat/propdense.c",
1360+
"src/sat/kissat/propinitially.c",
1361+
"src/sat/kissat/proprobe.c",
1362+
"src/sat/kissat/propsearch.c",
1363+
"src/sat/kissat/queue.c",
1364+
"src/sat/kissat/reduce.c",
1365+
"src/sat/kissat/reluctant.c",
1366+
"src/sat/kissat/reorder.c",
1367+
"src/sat/kissat/rephase.c",
1368+
"src/sat/kissat/report.c",
1369+
"src/sat/kissat/resize.c",
1370+
"src/sat/kissat/resolve.c",
1371+
"src/sat/kissat/resources.c",
1372+
"src/sat/kissat/restart.c",
1373+
"src/sat/kissat/search.c",
1374+
"src/sat/kissat/shrink.c",
1375+
"src/sat/kissat/smooth.c",
1376+
"src/sat/kissat/sort.c",
1377+
"src/sat/kissat/stack.c",
1378+
"src/sat/kissat/statistics.c",
1379+
"src/sat/kissat/strengthen.c",
1380+
"src/sat/kissat/substitute.c",
1381+
"src/sat/kissat/sweep.c",
1382+
"src/sat/kissat/terminate.c",
1383+
"src/sat/kissat/tiers.c",
1384+
"src/sat/kissat/trail.c",
1385+
"src/sat/kissat/transitive.c",
1386+
"src/sat/kissat/utilities.c",
1387+
"src/sat/kissat/vector.c",
1388+
"src/sat/kissat/vivify.c",
1389+
"src/sat/kissat/walk.c",
1390+
"src/sat/kissat/warmup.c",
1391+
"src/sat/kissat/watch.c",
1392+
"src/sat/kissat/weaken.c",
11911393
"src/sat/msat/msatActivity.c",
11921394
"src/sat/msat/msatClause.c",
11931395
"src/sat/msat/msatClauseVec.c",
@@ -1208,7 +1410,7 @@ cc_library(
12081410
"src/sat/xsat/xsatSolverAPI.c",
12091411
"src/sat/xsat/xsatSolver.c",
12101412
],
1211-
hdrs = glob(["src/**/*.h"]) + glob(["src/**/*.hpp"]),
1413+
hdrs = glob(["src/**/*.h"]) + glob(["src/**/*.hpp"]) + glob(["src/**/*.tpp"]),
12121414
copts = [
12131415
"-Wno-sign-compare",
12141416
"-Wno-unused-function",
@@ -1248,6 +1450,7 @@ cc_library(
12481450
"src/base/abci/abciUnfold2.c",
12491451
"src/base/abci/abcDarUnfold2.c",
12501452
"src/aig/saig/saigUnfold2.c",
1453+
"src/sat/kissat/sort.c",
12511454
],
12521455
visibility = ["//visibility:public"],
12531456
deps = [

src/base/io/ioJsonc.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ json_container_t* json_add_container(json_t *json) {
182182

183183
// Parse a JSON string
184184
json_value_t json_parse_string(json_t *json, uint32_t *pos) {
185-
json_value_t val = {0};
185+
json_value_t val = {0, 0, JSON_NULL};
186186
val.type = JSON_STRING;
187187
val.offset = *pos;
188188

@@ -200,7 +200,7 @@ json_value_t json_parse_string(json_t *json, uint32_t *pos) {
200200

201201
// Parse a JSON number
202202
json_value_t json_parse_number(json_t *json, uint32_t *pos) {
203-
json_value_t val = {0};
203+
json_value_t val = {0, 0, JSON_NULL};
204204
val.type = JSON_NUMBER;
205205
val.offset = *pos;
206206

@@ -220,7 +220,7 @@ json_value_t json_parse_number(json_t *json, uint32_t *pos) {
220220

221221
// Parse a JSON object
222222
json_value_t json_parse_object(json_t *json, uint32_t *pos) {
223-
json_value_t val = {0};
223+
json_value_t val = {0, 0, JSON_NULL};
224224
val.type = JSON_OBJECT;
225225
val.offset = *pos;
226226

@@ -275,7 +275,7 @@ json_value_t json_parse_object(json_t *json, uint32_t *pos) {
275275

276276
// Parse a JSON array
277277
json_value_t json_parse_array(json_t *json, uint32_t *pos) {
278-
json_value_t val = {0};
278+
json_value_t val = {0, 0, JSON_NULL};
279279
val.type = JSON_ARRAY;
280280
val.offset = *pos;
281281

@@ -322,7 +322,7 @@ json_value_t json_parse_array(json_t *json, uint32_t *pos) {
322322

323323
// Parse any JSON value
324324
json_value_t json_parse_value(json_t *json, uint32_t *pos) {
325-
json_value_t val = {0};
325+
json_value_t val = {0, 0, JSON_NULL};
326326

327327
json_skip_whitespace(json->str, pos, json->str_len);
328328

src/misc/util/abc_global.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ static inline void * Abc_FileReadContents( char * pFileName, int * pnFileSize )
525525
rewind( pFile );
526526
// load the contents of the file into memory
527527
pBuffer = ABC_ALLOC( char, nFileSize + 32 );
528-
fread( pBuffer, 1, nFileSize, pFile );
528+
(void) fread( pBuffer, 1, nFileSize, pFile );
529529
memset( pBuffer + nFileSize, 0, 32 );
530530
fclose( pFile );
531531
return (void *)pBuffer;

src/misc/util/utilPrefix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
//#include <cstdio>
4343

4444

45-
class Graph;
45+
struct Graph;
4646
class Node {
4747
public:
4848
Node(int bitpos, int level=0)

src/sat/cadical/cadical_arena.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ ABC_NAMESPACE_IMPL_START
77
namespace CaDiCaL {
88

99
Arena::Arena (Internal *i) {
10-
memset (this, 0, sizeof *this);
10+
from.start = 0;
11+
from.top = 0;
12+
from.end= 0;
13+
to.start = 0;
14+
to.top = 0;
15+
to.end= 0;
1116
internal = i;
1217
}
1318

0 commit comments

Comments
 (0)