commit 43b9d611a2313b9406da2d883fd41913de4a278d Author: surtur Date: Tue Jun 14 16:46:11 2022 +0200 initial commit diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..63555e8 --- /dev/null +++ b/.envrc @@ -0,0 +1,7 @@ +use flake + +# ref: https://github.com/direnv/direnv/wiki/Vim +# comment out if not planning to use this +add_extra_vimrc + +# vim: ff=unix ft=sh diff --git a/.example.vimrc b/.example.vimrc new file mode 100644 index 0000000..ca60fcf --- /dev/null +++ b/.example.vimrc @@ -0,0 +1,31 @@ +augroup vimgo_local + autocmd! + + " quality of life improvements, some as per + " https://github.com/fatih/vim-go/wiki/Tutorial#vimrc-improvements-1 + " run :GoBuild or :GoTestCompile based on the go file + function! s:build_go_files() + let l:file = expand('%') + if l:file =~# '^\f\+_test\.go$' + call go#test#Test(0, 1) + elseif l:file =~# '^\f\+\.go$' + call go#cmd#Build(0) + endif + endfunction + + autocmd FileType go nmap b :call build_go_files() + autocmd FileType go nmap gb :call build_go_files() + + autocmd FileType go nmap gc (go-coverage-toggle) + + let g:go_gopls_gofumpt=1 + let g:go_fmt_autosave=1 + let g:go_highlight_types = 1 + let g:go_fmt_command='gofumpt' + let g:go_test_timeout = '10s' + let g:go_highlight_build_constraints = 1 + + let g:go_metalinter_command = 'golangci-lint run .' + let g:go_metalinter_autosave = 1 + let g:go_metalinter_deadline = '3s' +augroup END diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..ad34792 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.go diff=golang +*.md diff=markdown +*.vimrc linguist-language=vim diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cbf8cc5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +.direnv + +# binaries/symlinks to binaries +result +result-* +math-optim + +.vimrc + +# coverage or other binary files +*.out + +# ignore image outputs by default, requiring explicit overrides +*.png +*.jp?g diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..448b611 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,95 @@ +# Copyright 2022 wanderer +# SPDX-License-Identifier: GPL-3.0-or-later + +--- +run: + go: 1.17.10 + tests: true + +issues: + max-issues-per-linter: 0 + max-same-issues: 0 + +linters: + enable: + - bidichk + - bodyclose + - dupl + - deadcode + - decorder + - dogsled + - exportloopref + - forbidigo + - gas + - gocognit + - goconst + - gocritic + - godot + - govet + - gofmt + - gofumpt + - goimports + - goprintffuncname + - gosec + - ineffassign + - ifshort + - misspell + # - prealloc # disable for now as it might be premature optimisation + - revive + - unconvert + - unparam + - varcheck + - whitespace + - wsl + +linter-settings: + dupl: + threshold: 100 + gocritic: + enabled-tags: + - diagnostic + - experimental + - opinionated + - performance + - style + disabled-checks: + - dupImport # https://github.com/go-critic/go-critic/issues/845 + - ifElseChain + - octalLiteral + - whyNoLint + - wrapperFunc + gocyclo: + min-complexity: 15 + gofumpt: + extra-rules: true + lang-version: "1.18" + govet: + check-shadowing: true + revive: + severity: warning + confidence: 0.8 + errorCode: 1 + warningCode: 1 + rules: + - name: blank-imports + - name: context-as-argument + - name: context-keys-type + - name: dot-imports + - name: error-return + - name: error-strings + - name: error-naming + - name: exported + - name: if-return + - name: increment-decrement + - name: var-naming + - name: var-declaration + - name: package-comments + - name: range + - name: receiver-naming + - name: time-naming + - name: unexported-return + - name: indent-error-flow + - name: errorf + - name: duplicated-imports + - name: modifies-value-receiver +... diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..2bde528 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,61 @@ +# Copyright 2022 wanderer +# SPDX-License-Identifier: GPL-3.0-or-later + +--- +fail_fast: false +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.2.0 + hooks: + - id: check-merge-conflict + - repo: meta + hooks: + - id: check-hooks-apply + - repo: local + hooks: + - id: statix + name: statix + entry: statix check . + always_run: false + pass_filenames: false + files: '\.*.nix$' + language: system + - id: nix-fmt + name: nix fmt + entry: nix fmt -- --check . + always_run: false + pass_filenames: false + files: '\.*.nix$' + language: system + - id: flake-check + name: nix flake check + entry: nix flake check --keep-going + always_run: false + pass_filenames: false + files: "flake.(nix|lock)$" + language: system + - id: addlicense + name: addlicence -check + entry: > + go run github.com/google/addlicense@v1.0.0 -check -v + pass_filenames: true + types_or: ["go", "yaml"] + exclude: "^.drone.*" + language: system + - repo: https://github.com/dnephin/pre-commit-golang + rev: v0.5.0 + hooks: + - id: go-mod-tidy + - id: go-unit-tests + - id: golangci-lint + - id: go-build + - repo: local + hooks: + - id: nix-build + name: nix build + entry: nix build .#math-optim + pass_filenames: false + # trigger this hook on changes to any of nix (also flake.lock) files + # and go's mod or sum files + files: '\.*.(nix|lock|mod|sum)$' + language: system diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8e73e9d --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2022 Adam Mirre + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 3 of the License, 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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..c4f4066 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# [`math-optim`](https://git.dotya.ml/wanderer/math-optim) + +> solving a few mathematical optimisation tasks using well-known algorithms + +[![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org) + +this repo holds the *sawce* of the semestral project for the Mathematical +Informatics course. + +### LICENSE +GPL-3.0-or-later (see [LICENSE](LICENSE) for details). diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..c580745 --- /dev/null +++ b/default.nix @@ -0,0 +1,16 @@ +( + import + ( + let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + in + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + { + src = ./.; + } +) +.defaultNix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..f8c3b9a --- /dev/null +++ b/flake.lock @@ -0,0 +1,60 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1653590866, + "narHash": "sha256-E4yKIrt/S//WfW5D9IhQ1dVuaAy8RE7EiCMfnbrOC78=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3e81a637cdf9f6e9b39aeb4d6e6394d1ad158e16", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1652840887, + "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-compat": "flake-compat", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..d54c0b0 --- /dev/null +++ b/flake.nix @@ -0,0 +1,202 @@ +{ + description = "mathematical informatics course semestral project solving a few mathematical optimisation tasks using well-known algorithms"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + flake-compat = { + url = "github:edolstra/flake-compat"; + flake = false; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-filter = { + url = "github:numtide/nix-filter"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { + self, + nixpkgs, + nix-filter, + ... + }: let + projname = "math-optim"; + + # to work with older version of flakes + lastModifiedDate = + self.lastModifiedDate or self.lastModified or "19700101"; + + # Generate a user-friendly version number. + version = "v0.0.0"; + + # System types to support. + # supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; + supportedSystems = ["x86_64-linux" "aarch64-linux"]; + + # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + + # Nixpkgs instantiated for supported system types. + nixpkgsFor = forAllSystems (system: + import nixpkgs { + inherit system; + overlays = [ + # no overlay imports atm + (import ./overlay.nix) + ]; + }); + in rec { + formatter = forAllSystems ( + system: + nixpkgsFor.${system}.alejandra + ); + + packages = forAllSystems (system: let + pkgs = nixpkgsFor.${system}; + inherit (pkgs) lib overlays; # -> lib = pkgs.lib;overlays = pkgs.overlays; + in rec { + math-optim = with pkgs; + buildGoModule rec { + pname = "${projname}"; + buildInputs = [ + go + ]; + nativeBuildInputs = [pkgconfig]; + + overrideModAttrs = _: { + GOPROXY = "direct"; + }; + + inherit version; + doCheck = false; + # use go.mod for managing go deps, instead of vendor-only dir + proxyVendor = true; + tags = []; # go "-tags" to build with + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + + modSha256 = lib.fakeSha256; + # dont't forget to update vendorSha256 whenever go.mod or go.sum change + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + # In 'nix develop', we don't need a copy of the source tree + # in the Nix store. + src = nix-filter.lib.filter { + root = lib.cleanSource ./.; + exclude = [ + ./flake.nix + ./flake.lock + ./default.nix + ./shell.nix + ]; + }; + + meta = { + description = "mathematical informatics course semestral project solving a few mathematical optimisation tasks using well-known algorithms"; + homepage = "https://git.dotya.ml/wanderer/math-optim"; + license = lib.licenses.gpl3; + maintainers = ["wanderer"]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; + }; + default = math-optim; + }); + + apps = forAllSystems (system: rec { + math-optim = { + type = "app"; + program = "${self.packages.${system}.${projname}}/bin/${projname}"; + }; + default = math-optim; + }); + + devShells = forAllSystems ( + system: let + pkgs = import nixpkgs { + inherit system; + overlays = [ + (import ./overlay.nix) + ]; + }; + goPkgs = import nixpkgs { + useFetched = true; + inherit system; + overlays = + self.overlays + or [] + ++ [ + (import ./overlay.nix) + ]; + }; + gob = pkgs.writeShellScriptBin "gob" '' + cd $(git rev-parse --show-toplevel) + go build -v ./... + ''; + gota = pkgs.writeShellScriptBin "gota" '' + cd $(git rev-parse --show-toplevel) + go test ./... + ''; + upcache = pkgs.writeShellScriptBin "upcache" '' + ## refs: + ## https://fzakaria.com/2020/08/11/caching-your-nix-shell.html + ## https://nixos.wiki/wiki/Caching_nix_shell_build_inputs + nix-store --query --references $(nix-instantiate shell.nix) | \ + xargs nix-store --realise | \ + xargs nix-store --query --requisites | \ + cachix push ${projname} + ''; + add-license = pkgs.writeShellScriptBin "add-license" '' + go run github.com/google/addlicense@v1.0.0 -v \ + -c "wanderer " \ + -l "GPL-3.0-or-later" -s . + ''; + in { + default = with pkgs; + mkShell + { + name = "${projname}-" + version; + + GOFLAGS = "-buildmode=pie -trimpath -mod=readonly -modcacherw"; + GOLDFLAGS = "-s -w -X main.version=${version}"; + CGO_CFLAGS = "-g0 -mtune=native"; + CGO_LDFLAGS = "-Wl,-O1,-sort-common,-as-needed,-z,relro,-z,now,-flto -pthread"; + GOPROXY = "direct"; + + shellHook = '' + echo " -- in math-optim dev shell..." + ''; + + nativeBuildInputs = [ + ]; + packages = + [ + # use pathed go, as it's (supposed to be) faster with cgo, + # which will inevitably encountered anyway. + goPkgs.go + go-tools + gopls + gofumpt + statix + golangci-lint + alejandra + + ## ad-hoc cmds + gob + gota + upcache + add-license + ] + ++ ( + if stdenv.isLinux + then [ + ] + else [] + ); + }; + } + ); + }; +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..c5e38df --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module git.dotya.ml/wanderer/math-optim + +go 1.18 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..e69de29 diff --git a/main.go b/main.go new file mode 100644 index 0000000..57372c6 --- /dev/null +++ b/main.go @@ -0,0 +1,15 @@ +// Copyright 2022 wanderer +// SPDX-License-Identifier: GPL-3.0-or-later + +package main + +import ( + "log" +) + +var version = "development" + +func main() { + log.Println("starting math-optim version ", version) + log.Println("hey") +} diff --git a/overlay.nix b/overlay.nix new file mode 100644 index 0000000..b138c02 --- /dev/null +++ b/overlay.nix @@ -0,0 +1,64 @@ +# heavily inspired by https://github.com/diamondburned/gotk4-nix/blob/d2bd6577f1867cb740b281baa48a895aed494967/overlay.nix +self: super: let + patchelfer = arch: interpreter: + super.writeShellScriptBin + "${super.patchelf}/bin/patchelf --set-interpreter ${interpreter} \"$@\""; +in { + go = super.go.overrideAttrs (old: { + version = "1.18.2"; + src = builtins.fetchurl { + url = "https://go.dev/dl/go1.18.2.src.tar.gz"; + sha256 = "sha256:1qk7as7a5wx3522ldsq8il1il9ic5xhbl6drg89r4h63l8zd0i1c"; + }; + doCheck = false; + patches = + (old.patches or []) + ++ [ + # cmd/go/internal/work: concurrent ccompile routines + (super.fetchpatch { + url = "https://github.com/diamondburned/go/commit/ec3e1c9471f170187b6a7c83ab0364253f895c28.patch"; + sha256 = "sha256-KXP3gHRVHCVY60HnrLHv+QLib1hSYZOxsMjkbAiNi1g="; + }) + # cmd/cgo: concurrent file generation + (super.fetchpatch { + url = "https://github.com/diamondburned/go/commit/50e04befeca9ae63296a73c8d5d2870b904971b4.patch"; + sha256 = "sha256-6PNUBlhGj53XS7f3dYOisDQ1PJldqwmWcgBnPE0cZsE="; + }) + # the patches are also present locally for archival purposes + # ./patches/diamondburned/go/ec3e1c9471f170187b6a7c83ab0364253f895c28.patch + # ./patches/diamondburned/go/50e04befeca9ae63296a73c8d5d2870b904971b4.patch + # TODO(me): don't forget to download the patch files when bumping the + # urls above + ]; + }); + + # might as well be 'buildGoModule = super.buildGo118Module.override' but + # we're overriding just the go package itself and leaving the rest of the + # function alone. letting 'builGoModule' to be updated only with flake's + # nixpkgs updates therefore seems to be the more reasonable option. + buildGoModule = super.buildGoModule.override { + # use the go we just built from sources as 'go' in the buildGoModule func + inherit (self) go; + }; + + inherit (super) go-tools; + + # See https://sourceware.org/glibc/wiki/ABIList. + patchelf-x86_64 = patchelfer "x86_64" "/lib64/ld-linux-x86-64.so.2"; + patchelf-aarch64 = patchelfer "aarch64" "/lib/ld-linux-aarch64.so.1"; + + #dominikh = { + # go-tools = self.buildGoModule { + # name = "dominikh-go-tools"; + # src = super.fetchFromGitHub { + # owner = "dominikh"; + # repo = "go-tools"; + # rev = "f4a2f64ce2386d1d392f2da44043c5ee3fb48216"; + # sha256 = "1yhbz2sf332b6i00slsj4cn8r66x27kddw5vcjygkkiyny1a99qb"; + # }; + # vendorSha256 = "09jbarlbq47pcxy5zkja8gqvnqjp2mpbxnciv9lhilw9swqqwc0j"; + # doCheck = false; + # subPackages = [ "cmd/staticcheck" ]; + # }; + #}; +} diff --git a/patches/diamondburned/go/50e04befeca9ae63296a73c8d5d2870b904971b4.patch b/patches/diamondburned/go/50e04befeca9ae63296a73c8d5d2870b904971b4.patch new file mode 100644 index 0000000..57c14c5 --- /dev/null +++ b/patches/diamondburned/go/50e04befeca9ae63296a73c8d5d2870b904971b4.patch @@ -0,0 +1,883 @@ +From 50e04befeca9ae63296a73c8d5d2870b904971b4 Mon Sep 17 00:00:00 2001 +From: diamondburned +Date: Thu, 5 Aug 2021 16:47:49 -0700 +Subject: [PATCH] cmd/cgo: concurrent file generation + +This commit allows cmd/cgo to generate files in parallel to each other. +The parallelism is determined by either the thread count (using +$GOMAXPROCS) or the -nparallel flag, which is set in +cmd/go/internal/work to be maximum 4. + +The commit addresses some existing race conditions that had to do with +mutating the global state by using a global write mutex during the +translation stage. + +Other race conditions that had to do with mutating the Package singleton +was solved by giving each translation worker its own package, and then +combining them back into a single package. + +With this and the cmd/go/internal/work changes in place, build time +(from scratch, with -a) for gotktrix is reduced from 33 minutes to 10 +minutes on an 8-thread Intel Core i5-8250U. +--- + src/cmd/cgo/gcc.go | 120 +++++++++++----- + src/cmd/cgo/godefs.go | 6 +- + src/cmd/cgo/main.go | 238 ++++++++++++++++++++++++------- + src/cmd/cgo/out.go | 20 ++- + src/cmd/cgo/util.go | 13 +- + src/cmd/go/internal/work/exec.go | 7 +- + 6 files changed, 303 insertions(+), 101 deletions(-) + +diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go +index 997a830994f0..59a8405c0c71 100644 +--- a/src/cmd/cgo/gcc.go ++++ b/src/cmd/cgo/gcc.go +@@ -26,6 +26,8 @@ import ( + "os/exec" + "strconv" + "strings" ++ "sync" ++ "sync/atomic" + "unicode" + "unicode/utf8" + +@@ -485,7 +487,7 @@ func (p *Package) guessKinds(f *File) []*Name { + } + needType = append(needType, n) + } +- if nerrors > 0 { ++ if nerrors.has() { + // Check if compiling the preamble by itself causes any errors, + // because the messages we've printed out so far aren't helpful + // to users debugging preamble mistakes. See issue 8442. +@@ -727,9 +729,12 @@ func (p *Package) prepareNames(f *File) { + } + } + p.mangleName(n) ++ ++ globalMu.Lock() + if n.Kind == "type" && typedef[n.Mangle] == nil { + typedef[n.Mangle] = n.Type + } ++ globalMu.Unlock() + } + } + +@@ -1023,7 +1028,7 @@ func (p *Package) hasPointer(f *File, t ast.Expr, top bool) bool { + } + // Check whether this is a pointer to a C union (or class) + // type that contains a pointer. +- if unionWithPointer[t.X] { ++ if isUnionWithPointer(t.X) { + return true + } + return p.hasPointer(f, t.X, false) +@@ -1046,7 +1051,10 @@ func (p *Package) hasPointer(f *File, t ast.Expr, top bool) bool { + } + } + } +- if def := typedef[t.Name]; def != nil { ++ globalMu.Lock() ++ def := typedef[t.Name] ++ globalMu.Unlock() ++ if def != nil { + return p.hasPointer(f, def.Go, top) + } + if t.Name == "string" { +@@ -1582,7 +1590,7 @@ func checkGCCBaseCmd() ([]string, error) { + } + + // gccMachine returns the gcc -m flag to use, either "-m32", "-m64" or "-marm". +-func (p *Package) gccMachine() []string { ++func gccMachine() []string { + switch goarch { + case "amd64": + if goos == "darwin" { +@@ -1617,20 +1625,20 @@ func (p *Package) gccMachine() []string { + return nil + } + +-func gccTmp() string { +- return *objDir + "_cgo_.o" ++func (p *Package) gccTmp() string { ++ return fmt.Sprintf("%s_%d_cgo_.o", *objDir, p.workerID) + } + + // gccCmd returns the gcc command line to use for compiling + // the input. + func (p *Package) gccCmd() []string { + c := append(gccBaseCmd, +- "-w", // no warnings +- "-Wno-error", // warnings are not errors +- "-o"+gccTmp(), // write object to tmp +- "-gdwarf-2", // generate DWARF v2 debugging symbols +- "-c", // do not link +- "-xc", // input language is C ++ "-w", // no warnings ++ "-Wno-error", // warnings are not errors ++ "-o"+p.gccTmp(), // write object to tmp ++ "-gdwarf-2", // generate DWARF v2 debugging symbols ++ "-c", // do not link ++ "-xc", // input language is C + ) + if p.GccIsClang { + c = append(c, +@@ -1653,7 +1661,7 @@ func (p *Package) gccCmd() []string { + } + + c = append(c, p.GccOptions...) +- c = append(c, p.gccMachine()...) ++ c = append(c, gccMachine()...) + if goos == "aix" { + c = append(c, "-maix64") + c = append(c, "-mcmodel=large") +@@ -1717,11 +1725,11 @@ func (p *Package) gccDebug(stdin []byte, nnames int) (d *dwarf.Data, ints []int6 + } + } + +- if f, err := macho.Open(gccTmp()); err == nil { ++ if f, err := macho.Open(p.gccTmp()); err == nil { + defer f.Close() + d, err := f.DWARF() + if err != nil { +- fatalf("cannot load DWARF output from %s: %v", gccTmp(), err) ++ fatalf("cannot load DWARF output from %s: %v", p.gccTmp(), err) + } + bo := f.ByteOrder + if f.Symtab != nil { +@@ -1795,11 +1803,11 @@ func (p *Package) gccDebug(stdin []byte, nnames int) (d *dwarf.Data, ints []int6 + return d, ints, floats, strs + } + +- if f, err := elf.Open(gccTmp()); err == nil { ++ if f, err := elf.Open(p.gccTmp()); err == nil { + defer f.Close() + d, err := f.DWARF() + if err != nil { +- fatalf("cannot load DWARF output from %s: %v", gccTmp(), err) ++ fatalf("cannot load DWARF output from %s: %v", p.gccTmp(), err) + } + bo := f.ByteOrder + symtab, err := f.Symbols() +@@ -1874,11 +1882,11 @@ func (p *Package) gccDebug(stdin []byte, nnames int) (d *dwarf.Data, ints []int6 + return d, ints, floats, strs + } + +- if f, err := pe.Open(gccTmp()); err == nil { ++ if f, err := pe.Open(p.gccTmp()); err == nil { + defer f.Close() + d, err := f.DWARF() + if err != nil { +- fatalf("cannot load DWARF output from %s: %v", gccTmp(), err) ++ fatalf("cannot load DWARF output from %s: %v", p.gccTmp(), err) + } + bo := binary.LittleEndian + for _, s := range f.Symbols { +@@ -1946,11 +1954,11 @@ func (p *Package) gccDebug(stdin []byte, nnames int) (d *dwarf.Data, ints []int6 + return d, ints, floats, strs + } + +- if f, err := xcoff.Open(gccTmp()); err == nil { ++ if f, err := xcoff.Open(p.gccTmp()); err == nil { + defer f.Close() + d, err := f.DWARF() + if err != nil { +- fatalf("cannot load DWARF output from %s: %v", gccTmp(), err) ++ fatalf("cannot load DWARF output from %s: %v", p.gccTmp(), err) + } + bo := binary.BigEndian + for _, s := range f.Symbols { +@@ -2016,7 +2024,7 @@ func (p *Package) gccDebug(stdin []byte, nnames int) (d *dwarf.Data, ints []int6 + buildStrings() + return d, ints, floats, strs + } +- fatalf("cannot parse gcc output %s as ELF, Mach-O, PE, XCOFF object", gccTmp()) ++ fatalf("cannot parse gcc output %s as ELF, Mach-O, PE, XCOFF object", p.gccTmp()) + panic("not reached") + } + +@@ -2026,7 +2034,7 @@ func (p *Package) gccDebug(stdin []byte, nnames int) (d *dwarf.Data, ints []int6 + // and its included files. + func (p *Package) gccDefines(stdin []byte) string { + base := append(gccBaseCmd, "-E", "-dM", "-xc") +- base = append(base, p.gccMachine()...) ++ base = append(base, gccMachine()...) + stdout, _ := runGcc(stdin, append(append(base, p.GccOptions...), "-")) + return stdout + } +@@ -2126,7 +2134,13 @@ type typeConv struct { + intSize int64 + } + +-var tagGen int ++var tagGenCounter int64 ++ ++func genTag() int { ++ return int(atomic.AddInt64(&tagGenCounter, 1) - 1) ++} ++ ++var globalMu sync.Mutex + var typedef = make(map[string]*Type) + var goIdent = make(map[string]*ast.Ident) + +@@ -2134,6 +2148,29 @@ var goIdent = make(map[string]*ast.Ident) + // that may contain a pointer. This is used for cgo pointer checking. + var unionWithPointer = make(map[ast.Expr]bool) + ++func unionWithPointerTrueIfKey(setKey, ifKey ast.Expr) { ++ globalMu.Lock() ++ defer globalMu.Unlock() ++ ++ if unionWithPointer[ifKey] { ++ unionWithPointer[setKey] = true ++ } ++} ++ ++func isUnionWithPointer(key ast.Expr) bool { ++ globalMu.Lock() ++ defer globalMu.Unlock() ++ ++ return unionWithPointer[key] ++} ++ ++func unionWithPointerTrue(key ast.Expr) { ++ globalMu.Lock() ++ defer globalMu.Unlock() ++ ++ unionWithPointer[key] = true ++} ++ + // anonymousStructTag provides a consistent tag for an anonymous struct. + // The same dwarf.StructType pointer will always get the same tag. + var anonymousStructTag = make(map[*dwarf.StructType]string) +@@ -2472,9 +2509,7 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + t.Size = t1.Size + t.Align = t1.Align + t.Go = t1.Go +- if unionWithPointer[t1.Go] { +- unionWithPointer[t.Go] = true +- } ++ unionWithPointerTrueIfKey(t.Go, t1.Go) + t.EnumValues = nil + t.Typedef = "" + t.C.Set("%s "+dt.Qual, t1.C) +@@ -2488,18 +2523,21 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + break + } + if tag == "" { ++ globalMu.Lock() + tag = anonymousStructTag[dt] + if tag == "" { +- tag = "__" + strconv.Itoa(tagGen) +- tagGen++ ++ tag = "__" + strconv.Itoa(genTag()) + anonymousStructTag[dt] = tag + } ++ globalMu.Unlock() + } else if t.C.Empty() { + t.C.Set(dt.Kind + " " + tag) + } + name := c.Ident("_Ctype_" + dt.Kind + "_" + tag) + t.Go = name // publish before recursive calls ++ globalMu.Lock() + goIdent[name.Name] = name ++ globalMu.Unlock() + if dt.ByteSize < 0 { + // Size calculation in c.Struct/c.Opaque will die with size=-1 (unknown), + // so execute the basic things that the struct case would do +@@ -2519,20 +2557,24 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + // on the Go heap, right? It currently doesn't work for unions because + // they are defined as a type alias for struct{}, not a defined type. + } ++ globalMu.Lock() + typedef[name.Name] = &tt ++ globalMu.Unlock() + break + } + switch dt.Kind { + case "class", "union": + t.Go = c.Opaque(t.Size) + if c.dwarfHasPointer(dt, pos) { +- unionWithPointer[t.Go] = true ++ unionWithPointerTrue(t.Go) + } + if t.C.Empty() { + t.C.Set("__typeof__(unsigned char[%d])", t.Size) + } + t.Align = 1 // TODO: should probably base this on field alignment. ++ globalMu.Lock() + typedef[name.Name] = t ++ globalMu.Unlock() + case "struct": + g, csyntax, align := c.Struct(dt, pos) + if t.C.Empty() { +@@ -2545,7 +2587,9 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + } + tt.Go = g + tt.NotInHeap = c.notInHeapStructs[tag] ++ globalMu.Lock() + typedef[name.Name] = &tt ++ globalMu.Unlock() + } + + case *dwarf.TypedefType: +@@ -2568,7 +2612,9 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + break + } + name := c.Ident("_Ctype_" + dt.Name) ++ globalMu.Lock() + goIdent[name.Name] = name ++ globalMu.Unlock() + akey := "" + if c.anonymousStructTypedef(dt) { + // only load type recursively for typedefs of anonymous +@@ -2583,10 +2629,12 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + s.BadPointer = true + sub = &s + // Make sure we update any previously computed type. ++ globalMu.Lock() + if oldType := typedef[name.Name]; oldType != nil { + oldType.Go = sub.Go + oldType.BadPointer = true + } ++ globalMu.Unlock() + } + if c.badVoidPointerTypedef(dt) { + // Treat this typedef as a pointer to a NotInHeap void. +@@ -2615,11 +2663,10 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + t.Go = name + t.BadPointer = sub.BadPointer + t.NotInHeap = sub.NotInHeap +- if unionWithPointer[sub.Go] { +- unionWithPointer[t.Go] = true +- } ++ unionWithPointerTrueIfKey(t.Go, sub.Go) + t.Size = sub.Size + t.Align = sub.Align ++ globalMu.Lock() + oldType := typedef[name.Name] + if oldType == nil { + tt := *t +@@ -2628,6 +2675,7 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + tt.NotInHeap = sub.NotInHeap + typedef[name.Name] = &tt + } ++ globalMu.Unlock() + + // If sub.Go.Name is "_Ctype_struct_foo" or "_Ctype_union_foo" or "_Ctype_class_foo", + // use that as the Go form for this typedef too, so that the typedef will be interchangeable +@@ -2638,7 +2686,9 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + + if isStructUnionClass(sub.Go) { + // Use the typedef name for C code. ++ globalMu.Lock() + typedef[sub.Go.(*ast.Ident).Name].C = t.C ++ globalMu.Unlock() + } + + // If we've seen this typedef before, and it +@@ -2698,8 +2748,12 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ + } + s = strings.Replace(s, " ", "", -1) + name := c.Ident("_Ctype_" + s) ++ + tt := *t ++ globalMu.Lock() + typedef[name.Name] = &tt ++ globalMu.Unlock() ++ + if !*godefs { + t.Go = name + } +diff --git a/src/cmd/cgo/godefs.go b/src/cmd/cgo/godefs.go +index c0d59aee01d7..740aa3bc30b2 100644 +--- a/src/cmd/cgo/godefs.go ++++ b/src/cmd/cgo/godefs.go +@@ -115,11 +115,11 @@ func (p *Package) godefs(f *File) string { + return buf.String() + } + +-var gofmtBuf bytes.Buffer +- + // gofmt returns the gofmt-formatted string for an AST node. + func gofmt(n interface{}) string { +- gofmtBuf.Reset() ++ var gofmtBuf strings.Builder ++ gofmtBuf.Grow(512) ++ + err := printer.Fprint(&gofmtBuf, fset, n) + if err != nil { + return "<" + err.Error() + ">" +diff --git a/src/cmd/cgo/main.go b/src/cmd/cgo/main.go +index 14642b7576b0..36e76908c602 100644 +--- a/src/cmd/cgo/main.go ++++ b/src/cmd/cgo/main.go +@@ -26,6 +26,7 @@ import ( + "runtime" + "sort" + "strings" ++ "sync" + + "cmd/internal/edit" + "cmd/internal/objabi" +@@ -33,6 +34,8 @@ import ( + + // A Package collects information about the package we're going to write. + type Package struct { ++ workerID int ++ + PackageName string // name of package + PackagePath string + PtrSize int64 +@@ -40,17 +43,36 @@ type Package struct { + GccOptions []string + GccIsClang bool + CgoFlags map[string][]string // #cgo flags (CFLAGS, LDFLAGS) +- Written map[string]bool +- Name map[string]*Name // accumulated Name from Files ++ Written *WrittenFiles ++ Name map[string]*Name // TODO: parallelize. accumulated Name from Files + ExpFunc []*ExpFunc // accumulated ExpFunc from Files +- Decl []ast.Decl +- GoFiles []string // list of Go files +- GccFiles []string // list of gcc output files +- Preamble string // collected preamble for _cgo_export.h ++ Decl []ast.Decl `json:"-"` ++ GoFiles []string // list of Go files ++ GccFiles []string // list of gcc output files ++ Preamble string // collected preamble for _cgo_export.h ++ + typedefs map[string]bool // type names that appear in the types of the objects we're interested in + typedefList []typedefInfo + } + ++type WrittenFiles struct { ++ mut sync.Mutex ++ written map[string]struct{} ++} ++ ++func (w *WrittenFiles) Mark(file string) (shouldWrite bool) { ++ w.mut.Lock() ++ defer w.mut.Unlock() ++ ++ _, already := w.written[file] ++ if already { ++ return false ++ } ++ ++ w.written[file] = struct{}{} ++ return true ++} ++ + // A typedefInfo is an element on Package.typedefList: a typedef name + // and the position where it was required. + type typedefInfo struct { +@@ -87,7 +109,7 @@ func nameKeys(m map[string]*Name) []string { + + // A Call refers to a call of a C.xxx function in the AST. + type Call struct { +- Call *ast.CallExpr ++ Call *ast.CallExpr `json:"-"` + Deferred bool + Done bool + } +@@ -95,7 +117,7 @@ type Call struct { + // A Ref refers to an expression of the form C.xxx in the AST. + type Ref struct { + Name *Name +- Expr *ast.Expr ++ Expr *ast.Expr `json:"-"` + Context astContext + Done bool + } +@@ -108,13 +130,13 @@ var nameKinds = []string{"iconst", "fconst", "sconst", "type", "var", "fpvar", " + + // A Name collects information about C.xxx. + type Name struct { +- Go string // name used in Go referring to package C +- Mangle string // name used in generated Go +- C string // name used in C +- Define string // #define expansion +- Kind string // one of the nameKinds +- Type *Type // the type of xxx +- FuncType *FuncType ++ Go string // name used in Go referring to package C ++ Mangle string // name used in generated Go ++ C string // name used in C ++ Define string // #define expansion ++ Kind string // one of the nameKinds ++ Type *Type `json:"-"` // the type of xxx ++ FuncType *FuncType `json:"-"` + AddError bool + Const string // constant definition + } +@@ -133,23 +155,23 @@ func (n *Name) IsConst() bool { + // Such functions are identified in the Go input file + // by doc comments containing the line //export ExpName + type ExpFunc struct { +- Func *ast.FuncDecl +- ExpName string // name to use from C ++ Func *ast.FuncDecl `json:"-"` ++ ExpName string // name to use from C + Doc string + } + + // A TypeRepr contains the string representation of a type. + type TypeRepr struct { + Repr string +- FormatArgs []interface{} ++ FormatArgs []interface{} `json:"-"` + } + + // A Type collects information about a type in both the C and Go worlds. + type Type struct { + Size int64 + Align int64 +- C *TypeRepr +- Go ast.Expr ++ C *TypeRepr `json:"-"` ++ Go ast.Expr `json:"-"` + EnumValues map[string]int64 + Typedef string + BadPointer bool // this pointer type should be represented as a uintptr (deprecated) +@@ -223,6 +245,8 @@ var cPrefix string + + var fset = token.NewFileSet() + ++var nparallel = flag.Int("nparallel", runtime.GOMAXPROCS(0), "maximum parallel jobs") ++ + var dynobj = flag.String("dynimport", "", "if non-empty, print dynamic import data for that file") + var dynout = flag.String("dynout", "", "write -dynimport output to this file") + var dynpackage = flag.String("dynpackage", "main", "set Go package for -dynimport output") +@@ -241,11 +265,13 @@ var exportHeader = flag.String("exportheader", "", "where to write export header + var gccgo = flag.Bool("gccgo", false, "generate files for use with gccgo") + var gccgoprefix = flag.String("gccgoprefix", "", "-fgo-prefix option used with gccgo") + var gccgopkgpath = flag.String("gccgopkgpath", "", "-fgo-pkgpath option used with gccgo") +-var gccgoMangler func(string) string + var importRuntimeCgo = flag.Bool("import_runtime_cgo", true, "import runtime/cgo in generated code") + var importSyscall = flag.Bool("import_syscall", true, "import syscall in generated code") + var trimpath = flag.String("trimpath", "", "applies supplied rewrites or trims prefixes to recorded source file paths") + ++var gccgoMangler func(string) string ++var gccgoManglerOnce sync.Once ++ + var goarch, goos, gomips, gomips64 string + var gccBaseCmd []string + +@@ -302,7 +328,7 @@ func main() { + } + } + +- p := newPackage(args[:i]) ++ p := newPackage(args[:i], 0) + + // We need a C compiler to be available. Check this. + var err error +@@ -370,43 +396,152 @@ func main() { + } + *objDir += string(filepath.Separator) + +- for i, input := range goFiles { +- f := fs[i] +- p.Translate(f) +- for _, cref := range f.Ref { +- switch cref.Context { +- case ctxCall, ctxCall2: +- if cref.Name.Kind != "type" { +- break +- } +- old := *cref.Expr +- *cref.Expr = cref.Name.Type.Go +- f.Edit.Replace(f.offset(old.Pos()), f.offset(old.End()), gofmt(cref.Name.Type.Go)) +- } +- } +- if nerrors > 0 { +- os.Exit(2) +- } +- p.PackagePath = f.Package +- p.Record(f) +- if *godefs { +- os.Stdout.WriteString(p.godefs(f)) +- } else { +- p.writeOutput(f, input) ++ pkgs := doFiles(p, goFiles, fs) ++ ++ if !*godefs { ++ pkg := coalescePackages(pkgs) ++ pkg.writeDefs() ++ } ++ ++ if nerrors.get() > 0 { ++ os.Exit(2) ++ } ++} ++ ++type doFileJob struct { ++ input string ++ file *File ++} ++ ++func doFiles(p *Package, inputs []string, files []*File) []*Package { ++ if len(inputs) != len(files) { ++ fatalf("unexpected len(inputs) %d != len(files) %d", len(inputs), len(files)) ++ } ++ ++ jobCh := make(chan doFileJob) ++ ++ var wg sync.WaitGroup ++ wg.Add(*nparallel) ++ ++ pkgs := make([]*Package, *nparallel) ++ pkgs[0] = p ++ ++ for n := 1; n < *nparallel; n++ { ++ pkgs[n] = cloneNewPackage(p, n) ++ } ++ ++ for n := 0; n < *nparallel; n++ { ++ p := pkgs[n] ++ go func() { ++ doFileWorker(p, jobCh) ++ wg.Done() ++ }() ++ } ++ ++ for i := range inputs { ++ jobCh <- doFileJob{ ++ input: inputs[i], ++ file: files[i], + } + } + +- if !*godefs { +- p.writeDefs() ++ close(jobCh) ++ wg.Wait() ++ ++ return pkgs ++} ++ ++func doFileWorker(p *Package, jobCh <-chan doFileJob) *Package { ++ for job := range jobCh { ++ doFile(p, job.input, job.file) + } +- if nerrors > 0 { ++ ++ return p ++} ++ ++func doFile(p *Package, input string, f *File) { ++ p.Translate(f) ++ for _, cref := range f.Ref { ++ switch cref.Context { ++ case ctxCall, ctxCall2: ++ if cref.Name.Kind != "type" { ++ break ++ } ++ old := *cref.Expr ++ *cref.Expr = cref.Name.Type.Go ++ f.Edit.Replace(f.offset(old.Pos()), f.offset(old.End()), gofmt(cref.Name.Type.Go)) ++ } ++ } ++ if nerrors.get() > 0 { + os.Exit(2) + } ++ p.PackagePath = f.Package ++ p.Record(f) ++ if *godefs { ++ os.Stdout.WriteString(p.godefs(f)) ++ } else { ++ p.writeOutput(f, input) ++ } ++} ++ ++func cloneNewPackage(p *Package, workerID int) *Package { ++ return &Package{ ++ workerID: workerID, ++ PackageName: p.PackageName, ++ PackagePath: p.PackagePath, ++ PtrSize: p.PtrSize, ++ IntSize: p.IntSize, ++ GccOptions: p.GccOptions, // init in main only ++ GccIsClang: p.GccIsClang, ++ CgoFlags: p.CgoFlags, // init in main only ++ Written: p.Written, ++ } ++} ++ ++func coalescePackages(pkgs []*Package) *Package { ++ if len(pkgs) == 0 { ++ return nil ++ } ++ ++ nonEmpty := pkgs[:0] ++ for _, p := range pkgs { ++ if p.PackageName != "" { ++ nonEmpty = append(nonEmpty, p) ++ } ++ } ++ ++ pkgs = nonEmpty ++ pkg := pkgs[0] ++ ++ for _, p := range pkgs[1:] { ++ pkg.PackageName = p.PackageName ++ pkg.PackagePath = p.PackagePath ++ pkg.ExpFunc = append(pkg.ExpFunc, p.ExpFunc...) ++ pkg.Decl = append(pkg.Decl, p.Decl...) ++ pkg.GoFiles = append(pkg.GoFiles, p.GoFiles...) ++ pkg.GccFiles = append(pkg.GccFiles, p.GccFiles...) ++ pkg.Preamble += p.Preamble ++ ++ if pkg.Name == nil && p.Name != nil { ++ pkg.Name = p.Name ++ continue ++ } ++ ++ for k, v := range p.Name { ++ if o, ok := pkg.Name[k]; ok && !reflect.DeepEqual(v, o) { ++ fatalf("duplicate pkg.Name %s, %v == %v", k, v, o) ++ } ++ ++ pkg.Name[k] = v ++ } ++ } ++ ++ return pkg + } + + // newPackage returns a new Package that will invoke + // gcc with the additional arguments specified in args. +-func newPackage(args []string) *Package { ++func newPackage(args []string, workerID int) *Package { + goarch = runtime.GOARCH + if s := os.Getenv("GOARCH"); s != "" { + goarch = s +@@ -432,10 +567,13 @@ func newPackage(args []string) *Package { + os.Setenv("LC_ALL", "C") + + p := &Package{ ++ workerID: workerID, + PtrSize: ptrSize, + IntSize: intSize, + CgoFlags: make(map[string][]string), +- Written: make(map[string]bool), ++ Written: &WrittenFiles{ ++ written: make(map[string]struct{}), ++ }, + } + p.addToFlag("CFLAGS", args) + return p +diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go +index 4968f7059d9b..b934d12d9423 100644 +--- a/src/cmd/cgo/out.go ++++ b/src/cmd/cgo/out.go +@@ -32,14 +32,13 @@ var ( + + // writeDefs creates output files to be compiled by gc and gcc. + func (p *Package) writeDefs() { +- var fgo2, fc io.Writer +- f := creat(*objDir + "_cgo_gotypes.go") +- defer f.Close() +- fgo2 = f ++ fgo2 := creat(*objDir + "_cgo_gotypes.go") ++ defer fgo2.Close() ++ ++ var fc *os.File + if *gccgo { +- f := creat(*objDir + "_cgo_defun.c") +- defer f.Close() +- fc = f ++ fc = creat(*objDir + "_cgo_defun.c") ++ defer fc.Close() + } + fm := creat(*objDir + "_cgo_main.c") + +@@ -682,12 +681,11 @@ var isBuiltin = map[string]bool{ + + func (p *Package) writeOutputFunc(fgcc *os.File, n *Name) { + name := n.Mangle +- if isBuiltin[name] || p.Written[name] { ++ if isBuiltin[name] || !p.Written.Mark(name) { + // The builtins are already defined in the C prolog, and we don't + // want to duplicate function definitions we've already done. + return + } +- p.Written[name] = true + + if *gccgo { + p.writeGccgoOutputFunc(fgcc, n) +@@ -1294,7 +1292,7 @@ func (p *Package) writeExportHeader(fgcch io.Writer) { + + // gccgoToSymbol converts a name to a mangled symbol for gccgo. + func gccgoToSymbol(ppath string) string { +- if gccgoMangler == nil { ++ gccgoManglerOnce.Do(func() { + var err error + cmd := os.Getenv("GCCGO") + if cmd == "" { +@@ -1307,7 +1305,7 @@ func gccgoToSymbol(ppath string) string { + if err != nil { + fatalf("%v", err) + } +- } ++ }) + return gccgoMangler(ppath) + } + +diff --git a/src/cmd/cgo/util.go b/src/cmd/cgo/util.go +index 00d931b98a0c..bea77b841466 100644 +--- a/src/cmd/cgo/util.go ++++ b/src/cmd/cgo/util.go +@@ -11,6 +11,7 @@ import ( + exec "internal/execabs" + "io/ioutil" + "os" ++ "sync/atomic" + ) + + // run runs the command argv, feeding in stdin on standard input. +@@ -87,16 +88,22 @@ func lineno(pos token.Pos) string { + func fatalf(msg string, args ...interface{}) { + // If we've already printed other errors, they might have + // caused the fatal condition. Assume they're enough. +- if nerrors == 0 { ++ if !nerrors.has() { + fmt.Fprintf(os.Stderr, "cgo: "+msg+"\n", args...) + } + os.Exit(2) + } + +-var nerrors int ++type atomicNErrors uint64 ++ ++var nerrors atomicNErrors ++ ++func (n *atomicNErrors) add() { atomic.AddUint64((*uint64)(n), 1) } ++func (n *atomicNErrors) has() bool { return n.get() > 0 } ++func (n *atomicNErrors) get() uint64 { return atomic.LoadUint64((*uint64)(n)) } + + func error_(pos token.Pos, msg string, args ...interface{}) { +- nerrors++ ++ nerrors.add() + if pos.IsValid() { + fmt.Fprintf(os.Stderr, "%s: ", fset.Position(pos).String()) + } else { +diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go +index 0af39a991c02..ac658f4803ef 100644 +--- a/src/cmd/go/internal/work/exec.go ++++ b/src/cmd/go/internal/work/exec.go +@@ -2821,7 +2821,12 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo + cgoflags = append(cgoflags, "-trimpath", strings.Join(trimpath, ";")) + } + +- if err := b.run(a, execdir, p.ImportPath, cgoenv, cfg.BuildToolexec, cgoExe, "-objdir", objdir, "-importpath", p.ImportPath, cgoflags, "--", cgoCPPFLAGS, cgoCFLAGS, cgofiles); err != nil { ++ nparallel := runtime.GOMAXPROCS(0) ++ if nparallel > 4 { ++ nparallel = 4 ++ } ++ ++ if err := b.run(a, execdir, p.ImportPath, cgoenv, cfg.BuildToolexec, cgoExe, "-nparallel", strconv.Itoa(nparallel), "-objdir", objdir, "-importpath", p.ImportPath, cgoflags, "--", cgoCPPFLAGS, cgoCFLAGS, cgofiles); err != nil { + return nil, nil, err + } + outGo = append(outGo, gofiles...) diff --git a/patches/diamondburned/go/ec3e1c9471f170187b6a7c83ab0364253f895c28.patch b/patches/diamondburned/go/ec3e1c9471f170187b6a7c83ab0364253f895c28.patch new file mode 100644 index 0000000..f9310e7 --- /dev/null +++ b/patches/diamondburned/go/ec3e1c9471f170187b6a7c83ab0364253f895c28.patch @@ -0,0 +1,159 @@ +From ec3e1c9471f170187b6a7c83ab0364253f895c28 Mon Sep 17 00:00:00 2001 +From: diamondburned +Date: Thu, 5 Aug 2021 16:43:01 -0700 +Subject: [PATCH] cmd/go/internal/work: concurrent ccompile routines + +This commit allows execution of gcc and others after the cgo stage to be +concurrent. + +Prior to this change, only 1 gcc instance will run at a time. + +After this, these instances will be launched off in multiples at the +same time, where the parallelism is determined by the thread count, but +capped at 4 using gcBackendConcurrency to calculate. +--- + src/cmd/go/internal/work/exec.go | 97 +++++++++++++++++++++++++++----- + 1 file changed, 82 insertions(+), 15 deletions(-) + +diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go +index ac80f503cd89..0af39a991c02 100644 +--- a/src/cmd/go/internal/work/exec.go ++++ b/src/cmd/go/internal/work/exec.go +@@ -2838,48 +2838,70 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo + return objdir + fmt.Sprintf("_x%03d.o", oseq) + } + ++ jobCh := make(chan func() error) ++ jobErrCh := make(chan error) ++ ++ nparallel = gccConcurrency(a) ++ go func() { jobErrCh <- runJobDispatcher(nparallel, jobCh) }() ++ + // gcc + cflags := str.StringList(cgoCPPFLAGS, cgoCFLAGS) + for _, cfile := range cfiles { + ofile := nextOfile() +- if err := b.gcc(a, p, a.Objdir, ofile, cflags, objdir+cfile); err != nil { +- return nil, nil, err +- } ++ cfile := cfile + outObj = append(outObj, ofile) ++ ++ jobCh <- func() error { ++ return b.gcc(a, p, a.Objdir, ofile, cflags, objdir+cfile) ++ } + } + + for _, file := range gccfiles { + ofile := nextOfile() +- if err := b.gcc(a, p, a.Objdir, ofile, cflags, file); err != nil { +- return nil, nil, err +- } ++ ifile := file + outObj = append(outObj, ofile) ++ ++ jobCh <- func() error { ++ return b.gcc(a, p, a.Objdir, ofile, cflags, ifile) ++ } + } + + cxxflags := str.StringList(cgoCPPFLAGS, cgoCXXFLAGS) + for _, file := range gxxfiles { + ofile := nextOfile() +- if err := b.gxx(a, p, a.Objdir, ofile, cxxflags, file); err != nil { +- return nil, nil, err +- } ++ ifile := file + outObj = append(outObj, ofile) ++ ++ jobCh <- func() error { ++ return b.gxx(a, p, a.Objdir, ofile, cxxflags, ifile) ++ } + } + + for _, file := range mfiles { + ofile := nextOfile() +- if err := b.gcc(a, p, a.Objdir, ofile, cflags, file); err != nil { +- return nil, nil, err +- } ++ ifile := file + outObj = append(outObj, ofile) ++ ++ jobCh <- func() error { ++ return b.gcc(a, p, a.Objdir, ofile, cflags, ifile) ++ } + } + + fflags := str.StringList(cgoCPPFLAGS, cgoFFLAGS) + for _, file := range ffiles { + ofile := nextOfile() +- if err := b.gfortran(a, p, a.Objdir, ofile, fflags, file); err != nil { +- return nil, nil, err +- } ++ ifile := file + outObj = append(outObj, ofile) ++ ++ jobCh <- func() error { ++ return b.gfortran(a, p, a.Objdir, ofile, fflags, ifile) ++ } ++ } ++ ++ close(jobCh) ++ ++ if err := <-jobErrCh; err != nil { ++ return nil, nil, err + } + + switch cfg.BuildToolchainName { +@@ -2980,6 +3002,51 @@ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgo + return outGo, outObj, nil + } + ++// gccConcurrency returns the concurrency level for spawning gcc processes. ++func gccConcurrency(a *Action) int { ++ gcflags := str.StringList(forcedGcflags, a.Package.Internal.Gcflags) ++ return gcBackendConcurrency(gcflags) ++} ++ ++func runJobDispatcher(nparallel int, jobCh <-chan func() error) error { ++ var wg sync.WaitGroup ++ ++ var firstErr error ++ var errNum int ++ var errMut sync.Mutex ++ ++ semaphore := make(chan struct{}, nparallel) ++ ++ for job := range jobCh { ++ job := job ++ ++ wg.Add(1) ++ semaphore <- struct{}{} ++ ++ go func() { ++ defer wg.Done() ++ defer func() { <-semaphore }() ++ ++ if err := job(); err != nil { ++ errMut.Lock() ++ if firstErr == nil { ++ firstErr = err ++ } ++ errNum++ ++ errMut.Unlock() ++ } ++ }() ++ } ++ ++ wg.Wait() ++ ++ if errNum > 0 { ++ return fmt.Errorf("encountered %d errors, including: %w", errNum, firstErr) ++ } ++ ++ return nil ++} ++ + // dynimport creates a Go source file named importGo containing + // //go:cgo_import_dynamic directives for each symbol or library + // dynamically imported by the object files outObj. diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..017cf3f --- /dev/null +++ b/shell.nix @@ -0,0 +1,16 @@ +( + import + ( + let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + in + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + { + src = ./.; + } +) +.shellNix