[FOCAL] UBUNTU: [Config] s390x bump march to z13, with tune to z15
diff mbox series

Message ID 20191022134006.13040-1-xnox@ubuntu.com
State New
Headers show
Series
  • [FOCAL] UBUNTU: [Config] s390x bump march to z13, with tune to z15
Related show

Commit Message

Dimitri John Ledkov Oct. 22, 2019, 1:40 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1837525

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
---

 debian.master/config/annotations          |  8 ++++----
 debian.master/config/config.common.ubuntu | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

Comments

Seth Forshee Oct. 22, 2019, 8:39 p.m. UTC | #1
On Tue, Oct 22, 2019 at 02:40:06PM +0100, Dimitri John Ledkov wrote:
> BugLink: https://bugs.launchpad.net/bugs/1837525
> 
> Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>

Applied to unstable/master, thanks!
Seth Forshee Oct. 29, 2019, 8:24 p.m. UTC | #2
On Tue, Oct 22, 2019 at 03:39:40PM -0500, Seth Forshee wrote:
> On Tue, Oct 22, 2019 at 02:40:06PM +0100, Dimitri John Ledkov wrote:
> > BugLink: https://bugs.launchpad.net/bugs/1837525
> > 
> > Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
> 
> Applied to unstable/master, thanks!

Seems the compiler (or at least the cross compiler) in focal doesn't
support -mtune=z15:

s390x-linux-gnu-gcc: error: unrecognized argument in option '-mtune=z15'
s390x-linux-gnu-gcc: note: valid arguments to '-mtune=' are: arch10 arch11 arch12 arch13 arch5 arch6 arch7 arch8 arch9 native z10 z13 z14 z196 z9-109 z9-ec z900 z990 zEC12; did you mean 'z10'?

Seems we need to either put this off until we have compiler support, or
else tune for a different machine.
Dimitri John Ledkov Oct. 29, 2019, 8:29 p.m. UTC | #3
Which compiler are you using? Please provide full build log.

No, I do not mean z10.

I mean arch13 or z15 as should be renamed by now
https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg221632.html

GCC bootstrap in focal is bootstrapped for mtune z15.

ttps://launchpad.net/ubuntu/+source/gcc-9/9.2.1-12ubuntu1


On Tue, 29 Oct 2019, 21:24 Seth Forshee, <seth.forshee@canonical.com> wrote:

> On Tue, Oct 22, 2019 at 03:39:40PM -0500, Seth Forshee wrote:
> > On Tue, Oct 22, 2019 at 02:40:06PM +0100, Dimitri John Ledkov wrote:
> > > BugLink: https://bugs.launchpad.net/bugs/1837525
> > >
> > > Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
> >
> > Applied to unstable/master, thanks!
>
> Seems the compiler (or at least the cross compiler) in focal doesn't
> support -mtune=z15:
>
> s390x-linux-gnu-gcc: error: unrecognized argument in option '-mtune=z15'
> s390x-linux-gnu-gcc: note: valid arguments to '-mtune=' are: arch10 arch11
> arch12 arch13 arch5 arch6 arch7 arch8 arch9 native z10 z13 z14 z196 z9-109
> z9-ec z900 z990 zEC12; did you mean 'z10'?
>
> Seems we need to either put this off until we have compiler support, or
> else tune for a different machine.
>
Seth Forshee Oct. 29, 2019, 8:46 p.m. UTC | #4
On Tue, Oct 29, 2019 at 09:29:52PM +0100, Dimitri John Ledkov wrote:
> Which compiler are you using? Please provide full build log.
> 
> No, I do not mean z10.
> 
> I mean arch13 or z15 as should be renamed by now
> https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg221632.html
> 
> GCC bootstrap in focal is bootstrapped for mtune z15.
> 
> ttps://launchpad.net/ubuntu/+source/gcc-9/9.2.1-12ubuntu1

Well, it did fail when I tried to build yesterday, but when I tried
again to get your full build log it built fine. No doubt our chroots go
updated between then and now.

I've re-applied the patch, sorry for the noise.

> 
> 
> On Tue, 29 Oct 2019, 21:24 Seth Forshee, <seth.forshee@canonical.com> wrote:
> 
> > On Tue, Oct 22, 2019 at 03:39:40PM -0500, Seth Forshee wrote:
> > > On Tue, Oct 22, 2019 at 02:40:06PM +0100, Dimitri John Ledkov wrote:
> > > > BugLink: https://bugs.launchpad.net/bugs/1837525
> > > >
> > > > Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
> > >
> > > Applied to unstable/master, thanks!
> >
> > Seems the compiler (or at least the cross compiler) in focal doesn't
> > support -mtune=z15:
> >
> > s390x-linux-gnu-gcc: error: unrecognized argument in option '-mtune=z15'
> > s390x-linux-gnu-gcc: note: valid arguments to '-mtune=' are: arch10 arch11
> > arch12 arch13 arch5 arch6 arch7 arch8 arch9 native z10 z13 z14 z196 z9-109
> > z9-ec z900 z990 zEC12; did you mean 'z10'?
> >
> > Seems we need to either put this off until we have compiler support, or
> > else tune for a different machine.
> >

Patch
diff mbox series

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 029af6a836cb..947a5b12f9c3 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -12647,8 +12647,8 @@  CONFIG_MARCH_Z990                               policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z9_109                             policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z10                                policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z196                               policy<{'s390x': 'n'}>
-CONFIG_MARCH_ZEC12                              policy<{'s390x': 'y'}>
-CONFIG_MARCH_Z13                                policy<{'s390x': 'n'}>
+CONFIG_MARCH_ZEC12                              policy<{'s390x': 'n'}>
+CONFIG_MARCH_Z13                                policy<{'s390x': 'y'}>
 CONFIG_MARCH_Z14                                policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z15                                policy<{'s390x': 'n'}>
 
@@ -12724,10 +12724,10 @@  CONFIG_TUNE_Z990                                policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z9_109                              policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z10                                 policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z196                                policy<{'s390x': 'n'}>
-CONFIG_TUNE_ZEC12                               policy<{'s390x': 'y'}>
+CONFIG_TUNE_ZEC12                               policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z13                                 policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z14                                 policy<{'s390x': 'n'}>
-CONFIG_TUNE_Z15                                 policy<{'s390x': 'n'}>
+CONFIG_TUNE_Z15                                 policy<{'s390x': 'y'}>
 
 # Menu: Processor type and features >> Virtual address space size >> Architecture: arm64
 CONFIG_ARM64_VA_BITS_39                         policy<{'arm64': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3f70cc72650f..1098fbdc8c0f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3792,6 +3792,7 @@  CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 CONFIG_HAVE_LIVEPATCH=y
 CONFIG_HAVE_MARCH_Z10_FEATURES=y
+CONFIG_HAVE_MARCH_Z13_FEATURES=y
 CONFIG_HAVE_MARCH_Z196_FEATURES=y
 CONFIG_HAVE_MARCH_Z900_FEATURES=y
 CONFIG_HAVE_MARCH_Z990_FEATURES=y
@@ -5340,15 +5341,15 @@  CONFIG_MANAGER_SBS=m
 CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z10 is not set
-# CONFIG_MARCH_Z13 is not set
+CONFIG_MARCH_Z13=y
 # CONFIG_MARCH_Z14 is not set
 # CONFIG_MARCH_Z15 is not set
+CONFIG_MARCH_Z15_TUNE=y
 # CONFIG_MARCH_Z196 is not set
 # CONFIG_MARCH_Z900 is not set
 # CONFIG_MARCH_Z990 is not set
 # CONFIG_MARCH_Z9_109 is not set
-CONFIG_MARCH_ZEC12=y
-CONFIG_MARCH_ZEC12_TUNE=y
+# CONFIG_MARCH_ZEC12 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATH_EMULATION is not set
@@ -10242,12 +10243,12 @@  CONFIG_TUN=y
 # CONFIG_TUNE_Z10 is not set
 # CONFIG_TUNE_Z13 is not set
 # CONFIG_TUNE_Z14 is not set
-# CONFIG_TUNE_Z15 is not set
+CONFIG_TUNE_Z15=y
 # CONFIG_TUNE_Z196 is not set
 # CONFIG_TUNE_Z900 is not set
 # CONFIG_TUNE_Z990 is not set
 # CONFIG_TUNE_Z9_109 is not set
-CONFIG_TUNE_ZEC12=y
+# CONFIG_TUNE_ZEC12 is not set
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_TURRIS_MOX_RWTM=m
 CONFIG_TWL4030_CORE=y