Merge pull request #3663 from chipsalliance/fix-ci

Fix nightly CI
chipsalliance · Dec 1, 2023 · edf4e24 · edf4e24
2 parents 2bb7bd9 + b1af715
commit edf4e24
Show file tree

Hide file tree

Showing 8 changed files with 237 additions and 331 deletions.
diff --git a/.github/workflows/ci-circt-nightly.yml b/.github/workflows/ci-circt-nightly.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Update Staging Branch
-        uses: circt/update-staging-branch@v1.1.0
+        uses: circt/update-staging-branch@v1.2.0
         with:
           user: chiselbot
           email: [email protected]
@@ -34,7 +34,7 @@ jobs:
         id: determine-branch
         shell: bash
         run: |
-          branch=$(git rev-parse --abbrev-ref HEAD)
+          branch=$(git rev-parse HEAD)
           echo branches=\[\"$branch\"\] >> $GITHUB_OUTPUT
     outputs:
       branches: ${{ steps.determine-branch.outputs.branches }}

diff --git a/binder/includeConstants.txt b/binder/includeConstants.txt
@@ -16,24 +16,26 @@ FIRRTL_MEM_DIR_INFER
 FIRRTL_MEM_DIR_READ
 FIRRTL_MEM_DIR_WRITE
 FIRRTL_MEM_DIR_READ_WRITE
-# enum FirtoolPreserveAggregateMode
-FIRTOOL_PRESERVE_AGGREGATE_MODE_NONE
-FIRTOOL_PRESERVE_AGGREGATE_MODE_ONE_DIM_VEC
-FIRTOOL_PRESERVE_AGGREGATE_MODE_VEC
-FIRTOOL_PRESERVE_AGGREGATE_MODE_ALL
-# enum FirtoolPreserveValuesMode
-FIRTOOL_PRESERVE_VALUES_MODE_NONE
-FIRTOOL_PRESERVE_VALUES_MODE_NAMED
-FIRTOOL_PRESERVE_VALUES_MODE_ALL
-# enum FirtoolBuildMode
-FIRTOOL_BUILD_MODE_DEBUG
-FIRTOOL_BUILD_MODE_RELEASE
-# enum FirtoolRandomKind
-FIRTOOL_RANDOM_KIND_NONE
-FIRTOOL_RANDOM_KIND_MEM
-FIRTOOL_RANDOM_KIND_REG
-FIRTOOL_RANDOM_KIND_ALL
-# enum FirtoolCompanionMode
-FIRTOOL_COMPANION_MODE_BIND
-FIRTOOL_COMPANION_MODE_INSTANTIATE
-FIRTOOL_COMPANION_MODE_DROP
+# enum CirctFirtoolPreserveAggregateMode
+CIRCT_FIRTOOL_PRESERVE_AGGREGATE_MODE_NONE
+CIRCT_FIRTOOL_PRESERVE_AGGREGATE_MODE_ONE_DIM_VEC
+CIRCT_FIRTOOL_PRESERVE_AGGREGATE_MODE_VEC
+CIRCT_FIRTOOL_PRESERVE_AGGREGATE_MODE_ALL
+# enum CirctFirtoolPreserveValuesMode
+CIRCT_FIRTOOL_PRESERVE_VALUES_MODE_STRIP
+CIRCT_FIRTOOL_PRESERVE_VALUES_MODE_NONE
+CIRCT_FIRTOOL_PRESERVE_VALUES_MODE_NAMED
+CIRCT_FIRTOOL_PRESERVE_VALUES_MODE_ALL
+# enum CirctFirtoolBuildMode
+CIRCT_FIRTOOL_BUILD_MODE_DEFAULT
+CIRCT_FIRTOOL_BUILD_MODE_DEBUG
+CIRCT_FIRTOOL_BUILD_MODE_RELEASE
+# enum CirctFirtoolRandomKind
+CIRCT_FIRTOOL_RANDOM_KIND_NONE
+CIRCT_FIRTOOL_RANDOM_KIND_MEM
+CIRCT_FIRTOOL_RANDOM_KIND_REG
+CIRCT_FIRTOOL_RANDOM_KIND_ALL
+# enum CirctFirtoolCompanionMode
+CIRCT_FIRTOOL_COMPANION_MODE_BIND
+CIRCT_FIRTOOL_COMPANION_MODE_INSTANTIATE
+CIRCT_FIRTOOL_COMPANION_MODE_DROP
diff --git a/binder/includeFunctions.txt b/binder/includeFunctions.txt
@@ -80,93 +80,55 @@ firrtlAttrGetMemDir
 chirrtlTypeGetCMemory
 chirrtlTypeGetCMemoryPort
 
-# firtoolOptions
-firtoolOptionsCreateDefault
-firtoolOptionsDestroy
-firtoolOptionsSetOutputFilename
-firtoolOptionsGetOutputFilename
-firtoolOptionsSetDisableAnnotationsUnknown
-firtoolOptionsGetDisableAnnotationsUnknown
-firtoolOptionsSetDisableAnnotationsClassless
-firtoolOptionsGetDisableAnnotationsClassless
-firtoolOptionsSetLowerAnnotationsNoRefTypePorts
-firtoolOptionsGetLowerAnnotationsNoRefTypePorts
-firtoolOptionsSetPreserveAggregate
-firtoolOptionsGetPreserveAggregate
-firtoolOptionsSetPreserveValues
-firtoolOptionsGetPreserveValues
-firtoolOptionsSetBuildMode
-firtoolOptionsGetBuildMode
-firtoolOptionsSetDisableOptimization
-firtoolOptionsGetDisableOptimization
-firtoolOptionsSetExportChiselInterface
-firtoolOptionsGetExportChiselInterface
-firtoolOptionsSetChiselInterfaceOutDirectory
-firtoolOptionsGetChiselInterfaceOutDirectory
-firtoolOptionsSetVbToBv
-firtoolOptionsGetVbToBv
-firtoolOptionsSetCompanionMode
-firtoolOptionsGetCompanionMode
-firtoolOptionsSetDisableAggressiveMergeConnections
-firtoolOptionsGetDisableAggressiveMergeConnections
-firtoolOptionsSetEmitOMIR
-firtoolOptionsGetEmitOMIR
-firtoolOptionsSetOMIROutFile
-firtoolOptionsGetOMIROutFile
-firtoolOptionsSetLowerMemories
-firtoolOptionsGetLowerMemories
-firtoolOptionsSetBlackBoxRootPath
-firtoolOptionsGetBlackBoxRootPath
-firtoolOptionsSetReplSeqMem
-firtoolOptionsGetReplSeqMem
-firtoolOptionsSetReplSeqMemFile
-firtoolOptionsGetReplSeqMemFile
-firtoolOptionsSetExtractTestCode
-firtoolOptionsGetExtractTestCode
-firtoolOptionsSetIgnoreReadEnableMem
-firtoolOptionsGetIgnoreReadEnableMem
-firtoolOptionsSetDisableRandom
-firtoolOptionsGetDisableRandom
-firtoolOptionsSetOutputAnnotationFilename
-firtoolOptionsGetOutputAnnotationFilename
-firtoolOptionsSetEnableAnnotationWarning
-firtoolOptionsGetEnableAnnotationWarning
-firtoolOptionsSetAddMuxPragmas
-firtoolOptionsGetAddMuxPragmas
-firtoolOptionsSetEmitChiselAssertsAsSVA
-firtoolOptionsGetEmitChiselAssertsAsSVA
-firtoolOptionsSetEmitSeparateAlwaysBlocks
-firtoolOptionsGetEmitSeparateAlwaysBlocks
-firtoolOptionsSetEtcDisableInstanceExtraction
-firtoolOptionsGetEtcDisableInstanceExtraction
-firtoolOptionsSetEtcDisableRegisterExtraction
-firtoolOptionsGetEtcDisableRegisterExtraction
-firtoolOptionsSetEtcDisableModuleInlining
-firtoolOptionsGetEtcDisableModuleInlining
-firtoolOptionsSetAddVivadoRAMAddressConflictSynthesisBugWorkaround
-firtoolOptionsGetAddVivadoRAMAddressConflictSynthesisBugWorkaround
-firtoolOptionsSetCkgModuleName
-firtoolOptionsGetCkgModuleName
-firtoolOptionsSetCkgInputName
-firtoolOptionsGetCkgInputName
-firtoolOptionsSetCkgOutputName
-firtoolOptionsGetCkgOutputName
-firtoolOptionsSetCkgEnableName
-firtoolOptionsGetCkgEnableName
-firtoolOptionsSetCkgTestEnableName
-firtoolOptionsGetCkgTestEnableName
-firtoolOptionsSetExportModuleHierarchy
-firtoolOptionsGetExportModuleHierarchy
-firtoolOptionsSetStripFirDebugInfo
-firtoolOptionsGetStripFirDebugInfo
-firtoolOptionsSetStripDebugInfo
-firtoolOptionsGetStripDebugInfo
+# circtFirtoolOptions
+circtFirtoolOptionsCreateDefault
+circtFirtoolOptionsDestroy
+circtFirtoolOptionsSetOutputFilename
+circtFirtoolOptionsSetDisableUnknownAnnotations
+circtFirtoolOptionsSetDisableAnnotationsClassless
+circtFirtoolOptionsSetLowerAnnotationsNoRefTypePorts
+circtFirtoolOptionsSetPreserveAggregate
+circtFirtoolOptionsSetPreserveValues
+circtFirtoolOptionsSetBuildMode
+circtFirtoolOptionsSetDisableOptimization
+circtFirtoolOptionsSetExportChiselInterface
+circtFirtoolOptionsSetChiselInterfaceOutDirectory
+circtFirtoolOptionsSetVbToBv
+circtFirtoolOptionsSetNoDedup
+circtFirtoolOptionsSetCompanionMode
+circtFirtoolOptionsSetDisableAggressiveMergeConnections
+circtFirtoolOptionsSetEmitOmir
+circtFirtoolOptionsSetOmirOutFile
+circtFirtoolOptionsSetLowerMemories
+circtFirtoolOptionsSetBlackBoxRootPath
+circtFirtoolOptionsSetReplSeqMem
+circtFirtoolOptionsSetReplSeqMemFile
+circtFirtoolOptionsSetExtractTestCode
+circtFirtoolOptionsSetIgnoreReadEnableMem
+circtFirtoolOptionsSetDisableRandom
+circtFirtoolOptionsSetOutputAnnotationFilename
+circtFirtoolOptionsSetEnableAnnotationWarning
+circtFirtoolOptionsSetAddMuxPragmas
+circtFirtoolOptionsSetEmitChiselAssertsAsSVA
+circtFirtoolOptionsSetEmitSeparateAlwaysBlocks
+circtFirtoolOptionsSetEtcDisableInstanceExtraction
+circtFirtoolOptionsSetEtcDisableRegisterExtraction
+circtFirtoolOptionsSetEtcDisableModuleInlining
+circtFirtoolOptionsSetAddVivadoRAMAddressConflictSynthesisBugWorkaround
+circtFirtoolOptionsSetCkgModuleName
+circtFirtoolOptionsSetCkgInputName
+circtFirtoolOptionsSetCkgOutputName
+circtFirtoolOptionsSetCkgEnableName
+circtFirtoolOptionsSetCkgTestEnableName
+circtFirtoolOptionsSetExportModuleHierarchy
+circtFirtoolOptionsSetStripFirDebugInfo
+circtFirtoolOptionsSetStripDebugInfo
 
-# populate functions
-firtoolPopulatePreprocessTransforms
-firtoolPopulateCHIRRTLToLowFIRRTL
-firtoolPopulateLowFIRRTLToHW
-firtoolPopulateHWToSV
-firtoolPopulateExportVerilog
-firtoolPopulateExportSplitVerilog
-firtoolPopulateFinalizeIR
+# circtFirtoolPopulate functions
+circtFirtoolPopulatePreprocessTransforms
+circtFirtoolPopulateCHIRRTLToLowFIRRTL
+circtFirtoolPopulateLowFIRRTLToHW
+circtFirtoolPopulateHWToSV
+circtFirtoolPopulateExportVerilog
+circtFirtoolPopulateExportSplitVerilog
+circtFirtoolPopulateFinalizeIR
diff --git a/binder/includeStructs.txt b/binder/includeStructs.txt
@@ -17,4 +17,4 @@ MlirOpPassManager
 MlirPass
 MlirLogicalResult
 FIRRTLBundleField
-FirtoolOptions
+CirctFirtoolFirtoolOptions