From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1158015-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 4DA4A138350
for <garchives@archives.gentoo.org>; Tue, 31 Mar 2020 18:39:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 27984E0990;
Tue, 31 Mar 2020 18:39:01 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 026E6E0990
for <gentoo-commits@lists.gentoo.org>; Tue, 31 Mar 2020 18:39:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D527634F394
for <gentoo-commits@lists.gentoo.org>; Tue, 31 Mar 2020 18:38:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A868C1B0
for <gentoo-commits@lists.gentoo.org>; Tue, 31 Mar 2020 18:38:57 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1585679903.391ec5099ee6d0c678943b70641d2b3e3c82ced4.mattst88@gentoo>
Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/arch/
X-VCS-Repository: proj/catalyst
X-VCS-Files: catalyst/arch/amd64.py catalyst/arch/x86.py
X-VCS-Directories: catalyst/arch/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 391ec5099ee6d0c678943b70641d2b3e3c82ced4
X-VCS-Branch: master
Date: Tue, 31 Mar 2020 18:38:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c59959b5-39a0-4fe2-a31c-634b5a79709d
X-Archives-Hash: 15ad9fd3a82d5868e858fffc94871847
commit: 391ec5099ee6d0c678943b70641d2b3e3c82ced4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 14:57:20 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 18:38:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=391ec509
catalyst: Enable and fix CPU_FLAGS_X86
In commit be6d7f0b7f0a (use profile for CPU_FLAGS_X86 where appropriate)
we disabled setting CPU_FLAGS_X86 to avoid overriding the profile's
defaults (and in some cases, overriding incorrectly).
While that is undoubtedly the correct thing to do for the generic
classes (e.g., arch_amd64) it does not make sense for the classes
specific to a particular microarchitecture, unless we expect the
defaults of CPU_FLAGS_X86 to change in the future, which seems highly
unlikely.
It also is the wrong thing to do for x86, which does not have a default
CPU_FLAGS_X86.
Fixes: be6d7f0b7f0a (use profile for CPU_FLAGS_X86 where appropriate)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/arch/amd64.py | 14 +++++---------
catalyst/arch/x86.py | 13 ++++++-------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index 73bf8b18..980be552 100644
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -11,51 +11,47 @@ class arch_amd64(generic_amd64):
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -pipe"
- #lines like this appears to be trying to set the profile default, better to use the profile
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
class arch_nocona(generic_amd64):
"improved version of Intel Pentium 4 CPU with 64-bit extensions, MMX, SSE, SSE2 and SSE3 support"
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=nocona -pipe"
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2","sse3"]}
-# Requires gcc 4.3 to use this class
class arch_core2(generic_amd64):
"Intel Core 2 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3 and SSSE3 support"
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=core2 -pipe"
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2","sse3","ssse3"]}
class arch_k8(generic_amd64):
"generic k8, opteron and athlon64 support"
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=k8 -pipe"
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse","sse2"]}
class arch_k8_sse3(generic_amd64):
"improved versions of k8, opteron and athlon64 with SSE3 support"
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=k8-sse3 -pipe"
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse","sse2","sse3"]}
class arch_amdfam10(generic_amd64):
"AMD Family 10h core based CPUs with x86-64 instruction set support"
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=amdfam10 -pipe"
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse","sse2","sse3","sse4a"]}
class arch_x32(generic_amd64):
"builder class for generic x32 (Intel and AMD)"
def __init__(self,myspec):
generic_amd64.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -pipe"
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
def register():
"inform main catalyst program of the contents of this plugin"
diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index de9142f7..4e50fea9 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -63,29 +63,28 @@ class arch_pentium3(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=pentium3 -pipe"
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse"]}
class arch_pentium4(generic_x86):
"Intel Pentium 4 CPU with MMX, SSE and SSE2 support"
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=pentium4 -pipe"
- #lines like this appears to be trying to set the profile default, better to use the profile
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2"]}
class arch_pentium_m(generic_x86):
"Intel Pentium M CPU with MMX, SSE and SSE2 support"
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=pentium-m -pipe"
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2"]}
class arch_prescott(generic_x86):
"improved version of Intel Pentium 4 CPU with MMX, SSE, SSE2 and SSE3 support"
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=prescott -pipe"
- #self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2","sse3"]}
class arch_k6(generic_x86):
"AMD K6 CPU with MMX support"
@@ -106,14 +105,14 @@ class arch_athlon(generic_x86):
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=athlon -pipe"
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","3dnow"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext"]}
class arch_athlon_xp(generic_x86):
"improved AMD Athlon CPU with MMX, 3DNow!, Enhanced 3DNow! and full SSE support"
def __init__(self,myspec):
generic_x86.__init__(self,myspec)
self.settings["COMMON_FLAGS"]="-O2 -march=athlon-xp -pipe"
- self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","3dnow","sse"]}
+ self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse"]}
def register():
"Inform main catalyst program of the contents of this plugin."