From cc0a90840a04e71c8f252e37e85921525ceaede7 Mon Sep 17 00:00:00 2001 From: Gabriel Gouvine Date: Mon, 9 Oct 2023 18:45:54 +0200 Subject: [PATCH 1/4] Remove autogenerated def.tab.h file --- lefdef/src/def/def/def.tab.h | 583 ----------------------------------- 1 file changed, 583 deletions(-) delete mode 100644 lefdef/src/def/def/def.tab.h diff --git a/lefdef/src/def/def/def.tab.h b/lefdef/src/def/def/def.tab.h deleted file mode 100644 index 785960860..000000000 --- a/lefdef/src/def/def/def.tab.h +++ /dev/null @@ -1,583 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - QSTRING = 258, - T_STRING = 259, - SITE_PATTERN = 260, - NUMBER = 261, - K_HISTORY = 262, - K_NAMESCASESENSITIVE = 263, - K_DESIGN = 264, - K_VIAS = 265, - K_TECH = 266, - K_UNITS = 267, - K_ARRAY = 268, - K_FLOORPLAN = 269, - K_SITE = 270, - K_CANPLACE = 271, - K_CANNOTOCCUPY = 272, - K_DIEAREA = 273, - K_PINS = 274, - K_DEFAULTCAP = 275, - K_MINPINS = 276, - K_WIRECAP = 277, - K_TRACKS = 278, - K_GCELLGRID = 279, - K_DO = 280, - K_BY = 281, - K_STEP = 282, - K_LAYER = 283, - K_ROW = 284, - K_RECT = 285, - K_COMPS = 286, - K_COMP_GEN = 287, - K_SOURCE = 288, - K_WEIGHT = 289, - K_EEQMASTER = 290, - K_FIXED = 291, - K_COVER = 292, - K_UNPLACED = 293, - K_PLACED = 294, - K_FOREIGN = 295, - K_REGION = 296, - K_REGIONS = 297, - K_NETS = 298, - K_START_NET = 299, - K_MUSTJOIN = 300, - K_ORIGINAL = 301, - K_USE = 302, - K_STYLE = 303, - K_PATTERN = 304, - K_PATTERNNAME = 305, - K_ESTCAP = 306, - K_ROUTED = 307, - K_NEW = 308, - K_SNETS = 309, - K_SHAPE = 310, - K_WIDTH = 311, - K_VOLTAGE = 312, - K_SPACING = 313, - K_NONDEFAULTRULE = 314, - K_NONDEFAULTRULES = 315, - K_N = 316, - K_S = 317, - K_E = 318, - K_W = 319, - K_FN = 320, - K_FE = 321, - K_FS = 322, - K_FW = 323, - K_GROUPS = 324, - K_GROUP = 325, - K_SOFT = 326, - K_MAXX = 327, - K_MAXY = 328, - K_MAXHALFPERIMETER = 329, - K_CONSTRAINTS = 330, - K_NET = 331, - K_PATH = 332, - K_SUM = 333, - K_DIFF = 334, - K_SCANCHAINS = 335, - K_START = 336, - K_FLOATING = 337, - K_ORDERED = 338, - K_STOP = 339, - K_IN = 340, - K_OUT = 341, - K_RISEMIN = 342, - K_RISEMAX = 343, - K_FALLMIN = 344, - K_FALLMAX = 345, - K_WIREDLOGIC = 346, - K_MAXDIST = 347, - K_ASSERTIONS = 348, - K_DISTANCE = 349, - K_MICRONS = 350, - K_END = 351, - K_IOTIMINGS = 352, - K_RISE = 353, - K_FALL = 354, - K_VARIABLE = 355, - K_SLEWRATE = 356, - K_CAPACITANCE = 357, - K_DRIVECELL = 358, - K_FROMPIN = 359, - K_TOPIN = 360, - K_PARALLEL = 361, - K_TIMINGDISABLES = 362, - K_THRUPIN = 363, - K_MACRO = 364, - K_PARTITIONS = 365, - K_TURNOFF = 366, - K_FROMCLOCKPIN = 367, - K_FROMCOMPPIN = 368, - K_FROMIOPIN = 369, - K_TOCLOCKPIN = 370, - K_TOCOMPPIN = 371, - K_TOIOPIN = 372, - K_SETUPRISE = 373, - K_SETUPFALL = 374, - K_HOLDRISE = 375, - K_HOLDFALL = 376, - K_VPIN = 377, - K_SUBNET = 378, - K_XTALK = 379, - K_PIN = 380, - K_SYNTHESIZED = 381, - K_DEFINE = 382, - K_DEFINES = 383, - K_DEFINEB = 384, - K_IF = 385, - K_THEN = 386, - K_ELSE = 387, - K_FALSE = 388, - K_TRUE = 389, - K_EQ = 390, - K_NE = 391, - K_LE = 392, - K_LT = 393, - K_GE = 394, - K_GT = 395, - K_OR = 396, - K_AND = 397, - K_NOT = 398, - K_SPECIAL = 399, - K_DIRECTION = 400, - K_RANGE = 401, - K_FPC = 402, - K_HORIZONTAL = 403, - K_VERTICAL = 404, - K_ALIGN = 405, - K_MIN = 406, - K_MAX = 407, - K_EQUAL = 408, - K_BOTTOMLEFT = 409, - K_TOPRIGHT = 410, - K_ROWS = 411, - K_TAPER = 412, - K_TAPERRULE = 413, - K_VERSION = 414, - K_DIVIDERCHAR = 415, - K_BUSBITCHARS = 416, - K_PROPERTYDEFINITIONS = 417, - K_STRING = 418, - K_REAL = 419, - K_INTEGER = 420, - K_PROPERTY = 421, - K_BEGINEXT = 422, - K_ENDEXT = 423, - K_NAMEMAPSTRING = 424, - K_ON = 425, - K_OFF = 426, - K_X = 427, - K_Y = 428, - K_COMPONENT = 429, - K_MASK = 430, - K_MASKSHIFT = 431, - K_COMPSMASKSHIFT = 432, - K_SAMEMASK = 433, - K_PINPROPERTIES = 434, - K_TEST = 435, - K_COMMONSCANPINS = 436, - K_SNET = 437, - K_COMPONENTPIN = 438, - K_REENTRANTPATHS = 439, - K_SHIELD = 440, - K_SHIELDNET = 441, - K_NOSHIELD = 442, - K_VIRTUAL = 443, - K_ANTENNAPINPARTIALMETALAREA = 444, - K_ANTENNAPINPARTIALMETALSIDEAREA = 445, - K_ANTENNAPINGATEAREA = 446, - K_ANTENNAPINDIFFAREA = 447, - K_ANTENNAPINMAXAREACAR = 448, - K_ANTENNAPINMAXSIDEAREACAR = 449, - K_ANTENNAPINPARTIALCUTAREA = 450, - K_ANTENNAPINMAXCUTCAR = 451, - K_SIGNAL = 452, - K_POWER = 453, - K_GROUND = 454, - K_CLOCK = 455, - K_TIEOFF = 456, - K_ANALOG = 457, - K_SCAN = 458, - K_RESET = 459, - K_RING = 460, - K_STRIPE = 461, - K_FOLLOWPIN = 462, - K_IOWIRE = 463, - K_COREWIRE = 464, - K_BLOCKWIRE = 465, - K_FILLWIRE = 466, - K_BLOCKAGEWIRE = 467, - K_PADRING = 468, - K_BLOCKRING = 469, - K_BLOCKAGES = 470, - K_PLACEMENT = 471, - K_SLOTS = 472, - K_FILLS = 473, - K_PUSHDOWN = 474, - K_NETLIST = 475, - K_DIST = 476, - K_USER = 477, - K_TIMING = 478, - K_BALANCED = 479, - K_STEINER = 480, - K_TRUNK = 481, - K_FIXEDBUMP = 482, - K_FENCE = 483, - K_FREQUENCY = 484, - K_GUIDE = 485, - K_MAXBITS = 486, - K_PARTITION = 487, - K_TYPE = 488, - K_ANTENNAMODEL = 489, - K_DRCFILL = 490, - K_OXIDE1 = 491, - K_OXIDE2 = 492, - K_OXIDE3 = 493, - K_OXIDE4 = 494, - K_CUTSIZE = 495, - K_CUTSPACING = 496, - K_DESIGNRULEWIDTH = 497, - K_DIAGWIDTH = 498, - K_ENCLOSURE = 499, - K_HALO = 500, - K_GROUNDSENSITIVITY = 501, - K_HARDSPACING = 502, - K_LAYERS = 503, - K_MINCUTS = 504, - K_NETEXPR = 505, - K_OFFSET = 506, - K_ORIGIN = 507, - K_ROWCOL = 508, - K_STYLES = 509, - K_POLYGON = 510, - K_PORT = 511, - K_SUPPLYSENSITIVITY = 512, - K_VIA = 513, - K_VIARULE = 514, - K_WIREEXT = 515, - K_EXCEPTPGNET = 516, - K_FILLWIREOPC = 517, - K_OPC = 518, - K_PARTIAL = 519, - K_ROUTEHALO = 520 - }; -#endif -/* Tokens. */ -#define QSTRING 258 -#define T_STRING 259 -#define SITE_PATTERN 260 -#define NUMBER 261 -#define K_HISTORY 262 -#define K_NAMESCASESENSITIVE 263 -#define K_DESIGN 264 -#define K_VIAS 265 -#define K_TECH 266 -#define K_UNITS 267 -#define K_ARRAY 268 -#define K_FLOORPLAN 269 -#define K_SITE 270 -#define K_CANPLACE 271 -#define K_CANNOTOCCUPY 272 -#define K_DIEAREA 273 -#define K_PINS 274 -#define K_DEFAULTCAP 275 -#define K_MINPINS 276 -#define K_WIRECAP 277 -#define K_TRACKS 278 -#define K_GCELLGRID 279 -#define K_DO 280 -#define K_BY 281 -#define K_STEP 282 -#define K_LAYER 283 -#define K_ROW 284 -#define K_RECT 285 -#define K_COMPS 286 -#define K_COMP_GEN 287 -#define K_SOURCE 288 -#define K_WEIGHT 289 -#define K_EEQMASTER 290 -#define K_FIXED 291 -#define K_COVER 292 -#define K_UNPLACED 293 -#define K_PLACED 294 -#define K_FOREIGN 295 -#define K_REGION 296 -#define K_REGIONS 297 -#define K_NETS 298 -#define K_START_NET 299 -#define K_MUSTJOIN 300 -#define K_ORIGINAL 301 -#define K_USE 302 -#define K_STYLE 303 -#define K_PATTERN 304 -#define K_PATTERNNAME 305 -#define K_ESTCAP 306 -#define K_ROUTED 307 -#define K_NEW 308 -#define K_SNETS 309 -#define K_SHAPE 310 -#define K_WIDTH 311 -#define K_VOLTAGE 312 -#define K_SPACING 313 -#define K_NONDEFAULTRULE 314 -#define K_NONDEFAULTRULES 315 -#define K_N 316 -#define K_S 317 -#define K_E 318 -#define K_W 319 -#define K_FN 320 -#define K_FE 321 -#define K_FS 322 -#define K_FW 323 -#define K_GROUPS 324 -#define K_GROUP 325 -#define K_SOFT 326 -#define K_MAXX 327 -#define K_MAXY 328 -#define K_MAXHALFPERIMETER 329 -#define K_CONSTRAINTS 330 -#define K_NET 331 -#define K_PATH 332 -#define K_SUM 333 -#define K_DIFF 334 -#define K_SCANCHAINS 335 -#define K_START 336 -#define K_FLOATING 337 -#define K_ORDERED 338 -#define K_STOP 339 -#define K_IN 340 -#define K_OUT 341 -#define K_RISEMIN 342 -#define K_RISEMAX 343 -#define K_FALLMIN 344 -#define K_FALLMAX 345 -#define K_WIREDLOGIC 346 -#define K_MAXDIST 347 -#define K_ASSERTIONS 348 -#define K_DISTANCE 349 -#define K_MICRONS 350 -#define K_END 351 -#define K_IOTIMINGS 352 -#define K_RISE 353 -#define K_FALL 354 -#define K_VARIABLE 355 -#define K_SLEWRATE 356 -#define K_CAPACITANCE 357 -#define K_DRIVECELL 358 -#define K_FROMPIN 359 -#define K_TOPIN 360 -#define K_PARALLEL 361 -#define K_TIMINGDISABLES 362 -#define K_THRUPIN 363 -#define K_MACRO 364 -#define K_PARTITIONS 365 -#define K_TURNOFF 366 -#define K_FROMCLOCKPIN 367 -#define K_FROMCOMPPIN 368 -#define K_FROMIOPIN 369 -#define K_TOCLOCKPIN 370 -#define K_TOCOMPPIN 371 -#define K_TOIOPIN 372 -#define K_SETUPRISE 373 -#define K_SETUPFALL 374 -#define K_HOLDRISE 375 -#define K_HOLDFALL 376 -#define K_VPIN 377 -#define K_SUBNET 378 -#define K_XTALK 379 -#define K_PIN 380 -#define K_SYNTHESIZED 381 -#define K_DEFINE 382 -#define K_DEFINES 383 -#define K_DEFINEB 384 -#define K_IF 385 -#define K_THEN 386 -#define K_ELSE 387 -#define K_FALSE 388 -#define K_TRUE 389 -#define K_EQ 390 -#define K_NE 391 -#define K_LE 392 -#define K_LT 393 -#define K_GE 394 -#define K_GT 395 -#define K_OR 396 -#define K_AND 397 -#define K_NOT 398 -#define K_SPECIAL 399 -#define K_DIRECTION 400 -#define K_RANGE 401 -#define K_FPC 402 -#define K_HORIZONTAL 403 -#define K_VERTICAL 404 -#define K_ALIGN 405 -#define K_MIN 406 -#define K_MAX 407 -#define K_EQUAL 408 -#define K_BOTTOMLEFT 409 -#define K_TOPRIGHT 410 -#define K_ROWS 411 -#define K_TAPER 412 -#define K_TAPERRULE 413 -#define K_VERSION 414 -#define K_DIVIDERCHAR 415 -#define K_BUSBITCHARS 416 -#define K_PROPERTYDEFINITIONS 417 -#define K_STRING 418 -#define K_REAL 419 -#define K_INTEGER 420 -#define K_PROPERTY 421 -#define K_BEGINEXT 422 -#define K_ENDEXT 423 -#define K_NAMEMAPSTRING 424 -#define K_ON 425 -#define K_OFF 426 -#define K_X 427 -#define K_Y 428 -#define K_COMPONENT 429 -#define K_MASK 430 -#define K_MASKSHIFT 431 -#define K_COMPSMASKSHIFT 432 -#define K_SAMEMASK 433 -#define K_PINPROPERTIES 434 -#define K_TEST 435 -#define K_COMMONSCANPINS 436 -#define K_SNET 437 -#define K_COMPONENTPIN 438 -#define K_REENTRANTPATHS 439 -#define K_SHIELD 440 -#define K_SHIELDNET 441 -#define K_NOSHIELD 442 -#define K_VIRTUAL 443 -#define K_ANTENNAPINPARTIALMETALAREA 444 -#define K_ANTENNAPINPARTIALMETALSIDEAREA 445 -#define K_ANTENNAPINGATEAREA 446 -#define K_ANTENNAPINDIFFAREA 447 -#define K_ANTENNAPINMAXAREACAR 448 -#define K_ANTENNAPINMAXSIDEAREACAR 449 -#define K_ANTENNAPINPARTIALCUTAREA 450 -#define K_ANTENNAPINMAXCUTCAR 451 -#define K_SIGNAL 452 -#define K_POWER 453 -#define K_GROUND 454 -#define K_CLOCK 455 -#define K_TIEOFF 456 -#define K_ANALOG 457 -#define K_SCAN 458 -#define K_RESET 459 -#define K_RING 460 -#define K_STRIPE 461 -#define K_FOLLOWPIN 462 -#define K_IOWIRE 463 -#define K_COREWIRE 464 -#define K_BLOCKWIRE 465 -#define K_FILLWIRE 466 -#define K_BLOCKAGEWIRE 467 -#define K_PADRING 468 -#define K_BLOCKRING 469 -#define K_BLOCKAGES 470 -#define K_PLACEMENT 471 -#define K_SLOTS 472 -#define K_FILLS 473 -#define K_PUSHDOWN 474 -#define K_NETLIST 475 -#define K_DIST 476 -#define K_USER 477 -#define K_TIMING 478 -#define K_BALANCED 479 -#define K_STEINER 480 -#define K_TRUNK 481 -#define K_FIXEDBUMP 482 -#define K_FENCE 483 -#define K_FREQUENCY 484 -#define K_GUIDE 485 -#define K_MAXBITS 486 -#define K_PARTITION 487 -#define K_TYPE 488 -#define K_ANTENNAMODEL 489 -#define K_DRCFILL 490 -#define K_OXIDE1 491 -#define K_OXIDE2 492 -#define K_OXIDE3 493 -#define K_OXIDE4 494 -#define K_CUTSIZE 495 -#define K_CUTSPACING 496 -#define K_DESIGNRULEWIDTH 497 -#define K_DIAGWIDTH 498 -#define K_ENCLOSURE 499 -#define K_HALO 500 -#define K_GROUNDSENSITIVITY 501 -#define K_HARDSPACING 502 -#define K_LAYERS 503 -#define K_MINCUTS 504 -#define K_NETEXPR 505 -#define K_OFFSET 506 -#define K_ORIGIN 507 -#define K_ROWCOL 508 -#define K_STYLES 509 -#define K_POLYGON 510 -#define K_PORT 511 -#define K_SUPPLYSENSITIVITY 512 -#define K_VIA 513 -#define K_VIARULE 514 -#define K_WIREEXT 515 -#define K_EXCEPTPGNET 516 -#define K_FILLWIREOPC 517 -#define K_OPC 518 -#define K_PARTIAL 519 -#define K_ROUTEHALO 520 - - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef int YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - - - From 34f5a88831724db4e6ab2bbda5659dfe572dd9d9 Mon Sep 17 00:00:00 2001 From: Gabriel Gouvine Date: Wed, 16 Aug 2023 08:24:45 +0200 Subject: [PATCH 2/4] Fix directory detection for alliance installer --- bootstrap/allianceInstaller.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bootstrap/allianceInstaller.sh b/bootstrap/allianceInstaller.sh index d9e27e683..72f5c65e0 100755 --- a/bootstrap/allianceInstaller.sh +++ b/bootstrap/allianceInstaller.sh @@ -7,10 +7,16 @@ # arch="Linux.el7_64" #fi - arch="Linux.el9" - if [ "`hostname -s`" == "bop" ]; then + arch_str=$((uname -srm)) + if [[ ${arch_str} =~ Linux.*(el9|al9).*x86_64 ]]; then + echo "Building for RHEL 9" + arch="Linux.el9" + elif [[ ${arch_str} =~ Linux.*(el7|al7).*x86_64 ]]; then echo "Building for RHEL 7" - arch="Linux.el7_64" + arch="Linux.el7" + else + echo "Building for Generic Linux" + arch="Linux.x86_64" fi nightly="" From 9e741461a5d52217a87cd94ef4c0c0db4982ec2e Mon Sep 17 00:00:00 2001 From: Gabriel Gouvine Date: Mon, 9 Oct 2023 19:00:02 +0200 Subject: [PATCH 3/4] Use main branch coloquinte submodule (no need for a separate coriolis-submodule branch anymore) --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 363ca7a05..fbc3b31c8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,5 +2,5 @@ path = subprojects/coloquinte # url = git@github.com:Coloquinte/PlaceRoute.git url = https://github.com/Coloquinte/PlaceRoute.git - branch = coriolis-submodule + branch = main update = merge From 4522818d3a5cd54defdb76a22fb79afacc4aad29 Mon Sep 17 00:00:00 2001 From: Gabriel Gouvine Date: Wed, 18 Oct 2023 12:38:23 +0200 Subject: [PATCH 4/4] Update coloquinte (warnings + overzealous assertion) --- subprojects/coloquinte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/coloquinte b/subprojects/coloquinte index 9b872a838..5bfeb63bd 160000 --- a/subprojects/coloquinte +++ b/subprojects/coloquinte @@ -1 +1 @@ -Subproject commit 9b872a838e2a16bfa8b46d18abbe4247e7253ee5 +Subproject commit 5bfeb63bd26e785bdb941809ae19e86d7c63aa59