Add CPU model support to target platform #313539

RossComputerGuy · 2024-05-22T01:45:06Z

Description of changes

Adds a cpuModel attribute to targetPlatform and defaults the CPU model to "generic". Might need a lot of work but I think this is a great start. We might want to check the CPU model based on the CPU arch coming in and have a fallback of only "generic" when we cannot match a recognized CPU arch.

Fixes #313530

Things done

Add a 👍 reaction to pull requests you find important.

Ericson2314 · 2024-05-22T03:02:36Z

This seems close to https://github.com/NixOS/nixpkgs/blob/master/lib/systems/architectures.nix ? My thought at the time with that is that I don't really know what the difference between an instruction set architecture and a "sub instruction set architecture", except for rather arbitrary conventions about what goes in the target triple or not, which I view as sort of historical accident we shouldn't take too seriously.

RossComputerGuy · 2024-05-22T03:17:17Z

This seems close to https://github.com/NixOS/nixpkgs/blob/master/lib/systems/architectures.nix ? My thought at the time with that is that I don't really know what the difference between an instruction set architecture and a "sub instruction set architecture", except for rather arbitrary conventions about what goes in the target triple or not, which I view as sort of historical accident we shouldn't take too seriously.

Yeah, though this mechanism is simpler. I'm not sure how that method works in Nixpkgs but this way you just add your CPU model to the end of config. It also allows for easy checking of common CPU models so marking certain packages as broken can be simpler. Adding this into the config stuff also allows for easy cross compiling via systems.examples. Also, this is compatible with LLVM, Zig, and GCC. The way things in Nixpkgs are done seems more GNU based.

RossComputerGuy · 2024-05-22T05:37:23Z

Idk what is up with by-name failing. I cannot reproduce that error with the information given.

RossComputerGuy · 2024-05-22T06:01:36Z

Just cleaned up the commits, fixed some of the issues found with CI. Made it so this doesn't rebuild everything if the CPU model is generic. I think this is at a state that I am happy.

RossComputerGuy · 2024-05-22T14:26:37Z

@ofborg build pkgsCross.asahi-m1.bash

alyssais · 2024-05-22T14:37:08Z

This seems close to https://github.com/NixOS/nixpkgs/blob/master/lib/systems/architectures.nix ? My thought at the time with that is that I don't really know what the difference between an instruction set architecture and a "sub instruction set architecture", except for rather arbitrary conventions about what goes in the target triple or not, which I view as sort of historical accident we shouldn't take too seriously.

Yeah, though this mechanism is simpler.

Does this allow us to get rid of architectures.nix? It's really annoying to have to extend that list with boilerplate when adding new architectures.

alyssais · 2024-05-22T14:38:09Z

pkgs/build-support/cc-wrapper/default.nix

@@ -634,6 +634,12 @@ stdenvNoCC.mkDerivation {
    + optionalString ((targetPlatform ? gcc.cpu) && (isClang || !(targetPlatform.isDarwin && targetPlatform.isAarch64))) ''
      echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before


Also does this replace this mechanism for specifying the CPU?

Yes it should replace it too, ideally.

Yes, I just didn't strip out the way things are done with gcc.tune and gcc.cpu because I didn't want to break too much. My initial goal was to just get this mechanism to work.

Unlike getting rid of architecture.nix, I am fine saving this for a follow-up PR :).

Yeah, that was my plan. Maybe add a couple warnings that the file is up for removal so that we can give people a buffer

Ericson2314 · 2024-05-22T14:39:41Z

Does this allow us to get rid of architectures.nix? It's really annoying to have to extend that list with boilerplate when adding new architectures.

Yeah bottom line is I want a unified way of doing things. If we are doing this, then I think it's a hard requirement that is replaces architecture.nix. Having multiple ways of specifying things was exactly the sort of thing that the big lib/systems reorg I did was supposed to solve --- I don't want it creeping back.

RossComputerGuy · 2024-05-22T14:39:55Z

This seems close to https://github.com/NixOS/nixpkgs/blob/master/lib/systems/architectures.nix ? My thought at the time with that is that I don't really know what the difference between an instruction set architecture and a "sub instruction set architecture", except for rather arbitrary conventions about what goes in the target triple or not, which I view as sort of historical accident we shouldn't take too seriously.

Yeah, though this mechanism is simpler.

Does this allow us to get rid of architectures.nix? It's really annoying to have to extend that list with boilerplate when adding new architectures.

Yes. This is a simpler alternative so we probably could deprecate it and remove it. This method only requires a couple lines to be changed and models which aren't added to the list could just have all the info specified as an attribute set instead of a string.

AndersonTorres · 2024-09-21T13:09:56Z

lib/systems/default.nix

@@ -25,7 +25,24 @@ let
  inspect = import ./inspect.nix { inherit lib; };
  platforms = import ./platforms.nix { inherit lib; };
  examples = import ./examples.nix { inherit lib; };
-  architectures = import ./architectures.nix { inherit lib; };
+
+  architectures = throw "lib.systems.architectures was deprecated and replaced via the new cpuModel attribute";


Deprecated has a specific meaning of "still works but we will remove in the future".
By using a throw, it no longer works.

Suggested change

architectures = throw "lib.systems.architectures was deprecated and replaced via the new cpuModel attribute";

architectures = throw "architectures was replaced by `cpuModel` attribute";

Alright, changed.

Implements the "cpuModel" attribute into system and pass it into the CC wrapper. This is meant as a multi-tool alternative to "gcc.cpu".

RossComputerGuy · 2025-01-23T19:03:27Z

Closing in favor of #376197

RossComputerGuy requested review from figsoda, Ericson2314 and alyssais as code owners May 22, 2024 01:45

github-actions bot added 6.topic: lib The Nixpkgs function library 6.topic: zig labels May 22, 2024

RossComputerGuy force-pushed the feat/cpumodel branch 2 times, most recently from d22bb42 to aa8c6a6 Compare May 22, 2024 02:41

RossComputerGuy force-pushed the feat/cpumodel branch from aa8c6a6 to 0aedb14 Compare May 22, 2024 04:14

github-actions bot added the 6.topic: stdenv Standard environment label May 22, 2024

RossComputerGuy force-pushed the feat/cpumodel branch from 0aedb14 to e91bfbc Compare May 22, 2024 05:16

github-actions bot removed the 6.topic: stdenv Standard environment label May 22, 2024

RossComputerGuy force-pushed the feat/cpumodel branch 5 times, most recently from befa041 to 34cad61 Compare May 22, 2024 05:34

RossComputerGuy force-pushed the feat/cpumodel branch 3 times, most recently from 45eb99b to f04dc9f Compare May 22, 2024 06:00

ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels May 22, 2024

alyssais reviewed May 22, 2024

View reviewed changes

RossComputerGuy force-pushed the feat/cpumodel branch from f5ec368 to 5f232ec Compare September 15, 2024 02:25

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 15, 2024

RossComputerGuy force-pushed the feat/cpumodel branch from 5f232ec to 7471dc4 Compare September 21, 2024 01:33

AndersonTorres reviewed Sep 21, 2024

View reviewed changes

RossComputerGuy force-pushed the feat/cpumodel branch 2 times, most recently from d567c24 to 5ac21f8 Compare September 22, 2024 02:06

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 27, 2024

RossComputerGuy force-pushed the feat/cpumodel branch from 5ac21f8 to 2a5740b Compare October 12, 2024 00:38

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 12, 2024

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 9, 2024

RossComputerGuy force-pushed the feat/cpumodel branch from 2a5740b to ab65087 Compare November 11, 2024 04:35

nix-owners bot requested review from Artturin, emilazy and philiptaron November 11, 2024 04:37

RossComputerGuy force-pushed the feat/cpumodel branch from ab65087 to ec06117 Compare November 11, 2024 04:37

RossComputerGuy added 8 commits November 10, 2024 20:40

{lib.systems.parse,stdenv.cc}: add cpu model

681514c

Implements the "cpuModel" attribute into system and pass it into the CC wrapper. This is meant as a multi-tool alternative to "gcc.cpu".

lib.systems: remove architecture

d0d1e74

zig: use cpu model from target platform

4d99274

openssl: replace gcc.arch with cpu model

e72516f

libsForQt5.qt5.qtwebengine: replace gcc.arch with cpu model

e7c3180

nixos/nix: replace gcc.arch with cpu model

9711e51

openblas: remove cpu model when using dynamic arch

5721b78

openblas: fix formatting

1874d07

RossComputerGuy force-pushed the feat/cpumodel branch from ec06117 to 1874d07 Compare November 11, 2024 04:41

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 11, 2024

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 10, 2024

RossComputerGuy mentioned this pull request Jan 23, 2025

lib.systems: replace gcc attributes with cpu options #376197

Draft

13 tasks

RossComputerGuy closed this Jan 23, 2025

RossComputerGuy deleted the feat/cpumodel branch January 23, 2025 19:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CPU model support to target platform #313539

Add CPU model support to target platform #313539

RossComputerGuy commented May 22, 2024 •

edited

Loading

Ericson2314 commented May 22, 2024

RossComputerGuy commented May 22, 2024 •

edited

Loading

RossComputerGuy commented May 22, 2024

RossComputerGuy commented May 22, 2024

RossComputerGuy commented May 22, 2024

alyssais commented May 22, 2024

alyssais May 22, 2024

Ericson2314 May 22, 2024

RossComputerGuy May 22, 2024 •

edited

Loading

Ericson2314 May 22, 2024 •

edited

Loading

RossComputerGuy May 22, 2024

Ericson2314 commented May 22, 2024

RossComputerGuy commented May 22, 2024

AndersonTorres Sep 21, 2024 •

edited

Loading

RossComputerGuy Sep 22, 2024

RossComputerGuy commented Jan 23, 2025

		@@ -634,6 +634,12 @@ stdenvNoCC.mkDerivation {
		+ optionalString ((targetPlatform ? gcc.cpu) && (isClang \|\| !(targetPlatform.isDarwin && targetPlatform.isAarch64))) ''
		echo "-mcpu=${targetPlatform.gcc.cpu}" >> $out/nix-support/cc-cflags-before

	architectures = throw "lib.systems.architectures was deprecated and replaced via the new cpuModel attribute";
	architectures = throw "architectures was replaced by `cpuModel` attribute";

Add CPU model support to target platform #313539

Add CPU model support to target platform #313539

Conversation

RossComputerGuy commented May 22, 2024 • edited Loading

Description of changes

Things done

Ericson2314 commented May 22, 2024

RossComputerGuy commented May 22, 2024 • edited Loading

RossComputerGuy commented May 22, 2024

RossComputerGuy commented May 22, 2024

RossComputerGuy commented May 22, 2024

alyssais commented May 22, 2024

alyssais May 22, 2024

Choose a reason for hiding this comment

Ericson2314 May 22, 2024

Choose a reason for hiding this comment

RossComputerGuy May 22, 2024 • edited Loading

Choose a reason for hiding this comment

Ericson2314 May 22, 2024 • edited Loading

Choose a reason for hiding this comment

RossComputerGuy May 22, 2024

Choose a reason for hiding this comment

Ericson2314 commented May 22, 2024

RossComputerGuy commented May 22, 2024

AndersonTorres Sep 21, 2024 • edited Loading

Choose a reason for hiding this comment

RossComputerGuy Sep 22, 2024

Choose a reason for hiding this comment

RossComputerGuy commented Jan 23, 2025

RossComputerGuy commented May 22, 2024 •

edited

Loading

RossComputerGuy commented May 22, 2024 •

edited

Loading

RossComputerGuy May 22, 2024 •

edited

Loading

Ericson2314 May 22, 2024 •

edited

Loading

AndersonTorres Sep 21, 2024 •

edited

Loading