mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-11-03 21:09:12 +00:00 
			
		
		
		
	Merge pull request #4297 from chenrui333/fix-master-branch-refs
chore: fix master branch refs
This commit is contained in:
		
						commit
						6248d5901b
					
				
					 17 changed files with 24 additions and 24 deletions
				
			
		
							
								
								
									
										2
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -43,7 +43,7 @@ body:
 | 
			
		|||
    attributes:
 | 
			
		||||
      value: >
 | 
			
		||||
        When providing steps to reproduce the issue, please ensure that the issue
 | 
			
		||||
        is reproducible in the current git master of Yosys. Also ensure to
 | 
			
		||||
        is reproducible in the current git main of Yosys. Also ensure to
 | 
			
		||||
        provide all necessary source files needed.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								.github/workflows/test-docs.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/test-docs.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -3,7 +3,7 @@ name: Build and test doc code samples
 | 
			
		|||
on:
 | 
			
		||||
  pull_request:
 | 
			
		||||
    branches:
 | 
			
		||||
    - master
 | 
			
		||||
    - main
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  test-docs:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -124,7 +124,7 @@ struct JnyWriter
 | 
			
		|||
        design->sort();
 | 
			
		||||
 | 
			
		||||
        f << "{\n";
 | 
			
		||||
        f << "  \"$schema\": \"https://raw.githubusercontent.com/YosysHQ/yosys/master/misc/jny.schema.json\",\n";
 | 
			
		||||
        f << "  \"$schema\": \"https://raw.githubusercontent.com/YosysHQ/yosys/main/misc/jny.schema.json\",\n";
 | 
			
		||||
        f << stringf("  \"generator\": \"%s\",\n", escape_string(yosys_version_str).c_str());
 | 
			
		||||
        f << "  \"version\": \"0.0.1\",\n";
 | 
			
		||||
        f << "  \"invocation\": \"" << escape_string(invk) << "\",\n";
 | 
			
		||||
| 
						 | 
				
			
			@ -426,7 +426,7 @@ struct JnyBackend : public Backend {
 | 
			
		|||
        log("        Don't include property information in the netlist output.\n");
 | 
			
		||||
        log("\n");
 | 
			
		||||
        log("The JSON schema for JNY output files is located in the \"jny.schema.json\" file\n");
 | 
			
		||||
        log("which is located at \"https://raw.githubusercontent.com/YosysHQ/yosys/master/misc/jny.schema.json\"\n");
 | 
			
		||||
        log("which is located at \"https://raw.githubusercontent.com/YosysHQ/yosys/main/misc/jny.schema.json\"\n");
 | 
			
		||||
        log("\n");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -633,9 +633,9 @@ with the mapping to ``SB_RAM40_4K`` done by :cmd:ref:`techmap` using
 | 
			
		|||
into flip flops (the ``logic fallback``) with :cmd:ref:`memory_map`.
 | 
			
		||||
 | 
			
		||||
.. |techlibs/ice40/brams.txt| replace:: :file:`techlibs/ice40/brams.txt`
 | 
			
		||||
.. _techlibs/ice40/brams.txt: https://github.com/YosysHQ/yosys/tree/master/techlibs/ice40/brams.txt
 | 
			
		||||
.. _techlibs/ice40/brams.txt: https://github.com/YosysHQ/yosys/tree/main/techlibs/ice40/brams.txt
 | 
			
		||||
.. |techlibs/ice40/brams_map.v| replace:: :file:`techlibs/ice40/brams_map.v`
 | 
			
		||||
.. _techlibs/ice40/brams_map.v: https://github.com/YosysHQ/yosys/tree/master/techlibs/ice40/brams_map.v
 | 
			
		||||
.. _techlibs/ice40/brams_map.v: https://github.com/YosysHQ/yosys/tree/main/techlibs/ice40/brams_map.v
 | 
			
		||||
 | 
			
		||||
.. literalinclude:: /cmd/synth_ice40.rst
 | 
			
		||||
   :language: yoscrypt
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,8 +16,8 @@ Automatic testing
 | 
			
		|||
 | 
			
		||||
.. _Yosys Git repo: https://github.com/YosysHQ/yosys
 | 
			
		||||
 | 
			
		||||
.. |test-linux| image:: https://github.com/YosysHQ/yosys/actions/workflows/test-linux.yml/badge.svg?branch=master
 | 
			
		||||
.. |test-macos| image:: https://github.com/YosysHQ/yosys/actions/workflows/test-macos.yml/badge.svg?branch=master
 | 
			
		||||
.. |test-linux| image:: https://github.com/YosysHQ/yosys/actions/workflows/test-linux.yml/badge.svg?branch=main
 | 
			
		||||
.. |test-macos| image:: https://github.com/YosysHQ/yosys/actions/workflows/test-macos.yml/badge.svg?branch=main
 | 
			
		||||
 | 
			
		||||
For up to date information, including OS versions, refer to `the git actions
 | 
			
		||||
page`_.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,7 +18,7 @@ in the circuit diagrams generated by it. The code used is included in the Yosys
 | 
			
		|||
code base under |code_examples/show|_.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/show| replace:: :file:`docs/source/code_examples/show`
 | 
			
		||||
.. _code_examples/show: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/show
 | 
			
		||||
.. _code_examples/show: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/show
 | 
			
		||||
 | 
			
		||||
A simple circuit
 | 
			
		||||
^^^^^^^^^^^^^^^^
 | 
			
		||||
| 
						 | 
				
			
			@ -337,7 +337,7 @@ The code used is included in the Yosys code base under
 | 
			
		|||
|code_examples/scrambler|_.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/scrambler| replace:: :file:`docs/source/code_examples/scrambler`
 | 
			
		||||
.. _code_examples/scrambler: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/scrambler
 | 
			
		||||
.. _code_examples/scrambler: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/scrambler
 | 
			
		||||
 | 
			
		||||
Changing design hierarchy
 | 
			
		||||
^^^^^^^^^^^^^^^^^^^^^^^^^
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,7 +29,7 @@ Let's take a look at an example included in the Yosys code base under
 | 
			
		|||
|code_examples/synth_flow|_:
 | 
			
		||||
 | 
			
		||||
.. |code_examples/synth_flow| replace:: :file:`docs/source/code_examples/synth_flow`
 | 
			
		||||
.. _code_examples/synth_flow: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/synth_flow
 | 
			
		||||
.. _code_examples/synth_flow: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/synth_flow
 | 
			
		||||
 | 
			
		||||
.. literalinclude:: /code_examples/synth_flow/techmap_01_map.v
 | 
			
		||||
   :language: verilog
 | 
			
		||||
| 
						 | 
				
			
			@ -81,7 +81,7 @@ The code used in this section is included in the Yosys code base under
 | 
			
		|||
|code_examples/axis|_.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/axis| replace:: :file:`docs/source/code_examples/axis`
 | 
			
		||||
.. _code_examples/axis: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/axis
 | 
			
		||||
.. _code_examples/axis: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/axis
 | 
			
		||||
 | 
			
		||||
The following AXI4 Stream Master has a bug. But the bug is not exposed if the
 | 
			
		||||
slave keeps ``tready`` asserted all the time. (Something a test bench might do.)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -405,7 +405,7 @@ those cases selection variables must be used to capture more complex selections.
 | 
			
		|||
Example code from |code_examples/selections|_:
 | 
			
		||||
 | 
			
		||||
.. |code_examples/selections| replace:: :file:`docs/source/code_examples/selections`
 | 
			
		||||
.. _code_examples/selections: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/selections
 | 
			
		||||
.. _code_examples/selections: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/selections
 | 
			
		||||
 | 
			
		||||
.. literalinclude:: /code_examples/selections/select.v
 | 
			
		||||
   :language: verilog
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -21,7 +21,7 @@ detail in the :doc:`/getting_started/example_synth` document.
 | 
			
		|||
   
 | 
			
		||||
   To learn more about these commands, check out :ref:`interactive_show`.
 | 
			
		||||
 | 
			
		||||
.. _example project: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/intro
 | 
			
		||||
.. _example project: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/intro
 | 
			
		||||
 | 
			
		||||
A simple counter
 | 
			
		||||
~~~~~~~~~~~~~~~~
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@ The extract pass
 | 
			
		|||
Example code can be found in |code_examples/macc|_.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/macc| replace:: :file:`docs/source/code_examples/macc`
 | 
			
		||||
.. _code_examples/macc: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/macc
 | 
			
		||||
.. _code_examples/macc: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/macc
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
.. literalinclude:: /code_examples/macc/macc_simple_test.ys
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,7 +36,7 @@ Example
 | 
			
		|||
|code_examples/synth_flow|_.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/synth_flow| replace:: :file:`docs/source/code_examples/synth_flow`
 | 
			
		||||
.. _code_examples/synth_flow: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/synth_flow
 | 
			
		||||
.. _code_examples/synth_flow: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/synth_flow
 | 
			
		||||
 | 
			
		||||
.. figure:: /_images/code_examples/synth_flow/memory_01.*
 | 
			
		||||
   :class: width-helper
 | 
			
		||||
| 
						 | 
				
			
			@ -92,7 +92,7 @@ leftover memory cells unable to be converted are then picked up by
 | 
			
		|||
 | 
			
		||||
For more on the lib format for :cmd:ref:`memory_libmap`, see
 | 
			
		||||
`passes/memory/memlib.md
 | 
			
		||||
<https://github.com/YosysHQ/yosys/blob/master/passes/memory/memlib.md>`_
 | 
			
		||||
<https://github.com/YosysHQ/yosys/blob/main/passes/memory/memlib.md>`_
 | 
			
		||||
 | 
			
		||||
Supported memory patterns
 | 
			
		||||
^^^^^^^^^^^^^^^^^^^^^^^^^
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -31,7 +31,7 @@ Example
 | 
			
		|||
|code_examples/synth_flow|_.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/synth_flow| replace:: :file:`docs/source/code_examples/synth_flow`
 | 
			
		||||
.. _code_examples/synth_flow: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/synth_flow
 | 
			
		||||
.. _code_examples/synth_flow: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/synth_flow
 | 
			
		||||
 | 
			
		||||
.. literalinclude:: /code_examples/synth_flow/proc_01.v
 | 
			
		||||
   :language: verilog
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ Code examples from this section are included in the
 | 
			
		|||
|code_examples/extensions|_ directory of the Yosys source code.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/extensions| replace:: :file:`docs/source/code_examples/extensions`
 | 
			
		||||
.. _code_examples/extensions: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/extensions
 | 
			
		||||
.. _code_examples/extensions: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/extensions
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Program components and data formats
 | 
			
		||||
| 
						 | 
				
			
			@ -254,7 +254,7 @@ The following is the complete code of the "stubnets" example module. It is
 | 
			
		|||
included in the Yosys source distribution under |code_examples/stubnets|_.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/stubnets| replace:: :file:`docs/source/code_examples/stubnets`
 | 
			
		||||
.. _code_examples/stubnets: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/stubnets
 | 
			
		||||
.. _code_examples/stubnets: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/stubnets
 | 
			
		||||
 | 
			
		||||
.. literalinclude:: /code_examples/stubnets/stubnets.cc
 | 
			
		||||
    :language: c++
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,7 +16,7 @@ Code examples used in this document are included in the Yosys code base under
 | 
			
		|||
|code_examples/techmap|_.
 | 
			
		||||
 | 
			
		||||
.. |code_examples/techmap| replace:: :file:`docs/source/code_examples/techmap`
 | 
			
		||||
.. _code_examples/techmap: https://github.com/YosysHQ/yosys/tree/master/docs/source/code_examples/techmap
 | 
			
		||||
.. _code_examples/techmap: https://github.com/YosysHQ/yosys/tree/main/docs/source/code_examples/techmap
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Mapping OR3X1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -44,7 +44,7 @@ Visual Studio builds are not directly supported by build scripts, but they are s
 | 
			
		|||
 | 
			
		||||
1. Easy way
 | 
			
		||||
 | 
			
		||||
  - Go to https://github.com/YosysHQ/yosys/actions/workflows/vs.yml?query=branch%3Amaster
 | 
			
		||||
  - Go to https://github.com/YosysHQ/yosys/actions/workflows/vs.yml?query=branch%3Amain
 | 
			
		||||
  - Click on the most recent completed run
 | 
			
		||||
  - In Artifacts region find vcxsrc and click on it to download
 | 
			
		||||
  - Unpack downloaded ZIP file
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -46,7 +46,7 @@ Open "Git Bash" in this directory and run:
 | 
			
		|||
	mv yosys yosys.bak
 | 
			
		||||
	git clone https://github.com/YosysHQ/yosys.git yosys
 | 
			
		||||
	cd yosys
 | 
			
		||||
	git checkout -B master $(git rev-parse HEAD | cut -c1-10)
 | 
			
		||||
	git checkout -B main $(git rev-parse HEAD | cut -c1-10)
 | 
			
		||||
	unzip ../genfiles.zip
 | 
			
		||||
EOT
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
{
 | 
			
		||||
	"$schema": "https://json-schema.org/draft/2020-12/schema",
 | 
			
		||||
	"$id": "https://raw.githubusercontent.com/YosysHQ/yosys/master/misc/jny.schema.json",
 | 
			
		||||
	"$id": "https://raw.githubusercontent.com/YosysHQ/yosys/main/misc/jny.schema.json",
 | 
			
		||||
	"title": "Yosys JSON Netlist metadata",
 | 
			
		||||
	"description": "Yosys JSON Netlist",
 | 
			
		||||
	"type": "object",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue