Skip to content

Merge develop into master - #219

Merged
mtravaillard merged 163 commits into
masterfrom
develop
Aug 11, 2026
Merged

Merge develop into master#219
mtravaillard merged 163 commits into
masterfrom
develop

Conversation

@mtravaillard

@mtravaillard mtravaillard commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

This PR merges Master into develop, goal is to use this as a clean release into master, to make a new tag and have a cleaner and more stable version.

Several changes comes with this merge :

  • Upgrading to CMake 3.27 as a minimal version (some variables are needed)
  • Examples and tests have been modified, more stable.
  • Better documentation for the project
  • Complete API documentation
  • Changed modelsim to questasim (mostly name change)
  • Fusesoc and ipxact importing into SoCMake
  • Better tools support
  • Several bug fixes

Risto97 added 30 commits April 9, 2025 22:05
@Risto97
Improve README
abd35ca
@Risto97
Add examples
3a76c5a
@Risto97
Merge branch 'master' into develop
e1c8e11
@Risto97
Version conditions for ip_link() (#137)
02d311b
@Risto97
Allow specifying FILE_SET(S) in ip_sources() and get_ip_sources() #116
27de24a
@Risto97
Fix get_ip_sources not retreiving all the source when FILE_SET is use…
6d71769 
…d in earlier calls
@Risto97
Implement DEFAULT file set, that is added to when ip_sources is calle…
8c59751 
…d without FILE_SET
@Risto97
Add more tests
98bd89a
@Risto97
Test get_ip_sources() NO_DEPS
823d845
@Risto97
Add FILE_SETS to ip_include_directories and get_ip_include_directories
143d3e8 
fix typo
@Risto97
Add FILE_SETS for ip_compile_definitions and get_ip_compile_definitions
70df701
@Risto97
Add file sets support for GHDL and iverilog
d5ae30f
@Risto97
Verilator add support for FILE_SETS
8d3817d
@Risto97
Add file sets to xcelium
659b815
@Risto97
move linters to lint #120 (#146)
3e12695
@Risto97
Add FILE_SETS support to modelsim/questasim
cd1a62d
@Risto97
Modelsim fix missing argument
314e498
@Risto97
Add VCS file sets support
9219813
@Risto97
Add support for FILE_SETS in vivado simulator
d3a5a0f
@Risto97
Merge pull request #141 from HEP-SoC/file_sets
4532686 
Implement file sets
@Risto97
Initial IPXact IP importer implementation
c0db7c7
@Risto97
extract ip_links from IPXact reference types
8be7b99
@Risto97
fix ipxact_importer stylesheets
8805edc
@Risto97
Introduce NO_ALIAS argument to add_ip, if passed, it will not create …
616e7d4 
…a alias target without version
@Risto97
Add SOCMAKE_ALLOW_UNDEFINED_TARGETS global variable, if set it allows…
f6ae93c 
… linking to IP libraries that were not yet defined
@Risto97
Update SoCMakeConfig.cmake
1633e87
@Risto97
If xmlstarlet not available use xsltproc
6f19b67
@Risto97
fix xsltproc fallback
c77b34e
@Risto97
Use file sets for ipxact importer
4090a72
@Risto97
rebase for file sets
ba2a254
@mtravaillard

mtravaillard commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Hi @Risto97, do you have any changes that you want to do before we merge into master ?
On our side, we still have to merge #226, #229 and #231.

@Risto97

Risto97 commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

On my side is fine

@benoitdenkinger Benoit Denkinger
socmake_message MACRO (#226)
83092b0 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
@mtravaillard
mtravaillard marked this pull request as ready for review June 29, 2026 13:59
@benoitdenkinger

benoitdenkinger commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

One final thing I would like to add is some linting using pre-commit hooks to have cleaner code.

@benoitdenkinger benoitdenkinger removed the trigger-gitlab-testing PRs receiving this label automatically trigger the testing workflow on gitlab CI runners. label Jun 29, 2026
benoitdenkinger and others added 7 commits July 2, 2026 11:08
@benoitdenkinger Benoit Denkinger
Testing (#229)
27867c6 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
@benoitdenkinger Benoit Denkinger
Added missing DESCRIPTION parameter and property (#231)
7488e8f 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
@benoitdenkinger Benoit Denkinger
Add pre-commit hooks and apply initial formatting (#233)
53c92fb 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
@benoitdenkinger Benoit Denkinger
generate_sv_sources_list FILE_SETS parameter (#238)
705a905 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
@benoitdenkinger Benoit Denkinger
peakrdl_socgen: SOCGEN_INJECT_V_FILES unset if not found (#240)
dc5f1e3 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
@benoitdenkinger Benoit Denkinger
verilator_build version reference updated (#241)
6157cf0 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
@mtravaillard
Update verilator_build argument in some examples following #241 (#242)
72cb952
@benoitdenkinger

benoitdenkinger commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

It is also fine for me to merge into master and continue the development there

benoitdenkinger and others added 4 commits July 20, 2026 16:00
@benoitdenkinger Benoit Denkinger
Var formatting (#235)
fb77394 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
@mtravaillard
Changes to help_utils.cmake to fix #234 and for better readability (#239
7345072 
)

Add function to generate .json files for different targets
Reordering of the functions for better readabilty
@benoitdenkinger Benoit Denkinger @mtravaillard
HWIP excluded ips keyword parameter (#237)
cd8d6ad 
Co-authored-by: Benoit Denkinger <benoit.denkinger@cern.ch>
Co-authored-by: mtravaillard <maxim.travaillard@gmail.com>
@mtravaillard
Update reference of develop to master (#232)
64f0efd
@mtravaillard mtravaillard added the trigger-gitlab-testing PRs receiving this label automatically trigger the testing workflow on gitlab CI runners. label Aug 10, 2026
@github-actions

github-actions Bot commented Aug 10, 2026 •
edited
Loading

Copy link
Copy Markdown
PR Preview Action v1.8.1
Preview removed because the pull request was closed.
2026-08-11 07:44 UTC

@mtravaillard
mtravaillard merged commit 073daa5 into master Aug 11, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@benoitdenkinger benoitdenkinger benoitdenkinger approved these changes

Assignees

No one assigned

Labels

trigger-gitlab-testing PRs receiving this label automatically trigger the testing workflow on gitlab CI runners. v1_release To be merged for v1.0.0 release

Projects

None yet

Milestone

1.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@mtravaillard @Risto97 @benoitdenkinger @nookfoo