* [PATCH v2 1/2] microblaze tune: Enable 64-bit
@ 2020-01-31 23:33 Mark Hatle
2020-01-31 23:33 ` [PATCH v2 2/2] microblaze tune: cleanup += Mark Hatle
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Mark Hatle @ 2020-01-31 23:33 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@xilinx.com>
64-bit is not yet available in Linux, but some non-Linux uses exist.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
meta/conf/machine/include/microblaze/arch-microblaze.inc | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc
index 265898b6b6..fb777d929c 100644
--- a/meta/conf/machine/include/microblaze/arch-microblaze.inc
+++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc
@@ -4,6 +4,9 @@
TUNEVALID[microblaze] = "MicroBlaze"
MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}"
+TUNEVALID[64-bit] = "64-bit MicroBlaze"
+MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}"
+
# Endian
TUNEVALID[bigendian] = "Use Microblaze Big Endian"
TUNECONFLICTS[bigendian] += "v10.0"
@@ -26,6 +29,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}"
# Disable reorder for v8.30 if pattern-compare is not enabled
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \
@@ -48,6 +52,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc
# Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess
TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}"
+# Add 64-bit to the PKGARCH if enabled.
+MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}"
+
# Package Architecture formatting
-TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
+TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 2/2] microblaze tune: cleanup += 2020-01-31 23:33 [PATCH v2 1/2] microblaze tune: Enable 64-bit Mark Hatle @ 2020-01-31 23:33 ` Mark Hatle 2020-02-01 0:41 ` akuster808 2020-02-03 19:29 ` Mark Hatle 2020-01-31 23:36 ` [PATCH v2 1/2] microblaze tune: Enable 64-bit Mark Hatle ` (2 subsequent siblings) 3 siblings, 2 replies; 9+ messages in thread From: Mark Hatle @ 2020-01-31 23:33 UTC (permalink / raw) To: openembedded-core From: Mark Hatle <mark.hatle@xilinx.com> Various += were used, refactor these to be either = or .= depending on usuage. CONFLICTS should be '=', as no leading space is required and they are not amending any other conflict settings. The TUNE_CCARGS should be .= so that if the feature does not define a CCARG blank spaces are not added to the CFLAGS. This is consistent to how the arm tuning is implemented. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> --- .../include/microblaze/arch-microblaze.inc | 22 +++++++++---------- .../microblaze/feature-microblaze-math.inc | 12 +++++----- .../feature-microblaze-versions.inc | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc index fb777d929c..19cc2b59b9 100644 --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc @@ -9,34 +9,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze # Endian TUNEVALID[bigendian] = "Use Microblaze Big Endian" -TUNECONFLICTS[bigendian] += "v10.0" +TUNECONFLICTS[bigendian] = "v10.0" MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" # General features TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" TUNEVALID[reorder] = "Enable Reorder Instructions" -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" # Core configuration tune optimizations TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" # Feature compiler args -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" # Disable reorder for v8.30 if pattern-compare is not enabled -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ bb.utils.contains("TUNE_FEATURES", "v8.30", \ bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ - "-mxl-reorder", "-mno-xl-reorder", d), \ - "-mxl-reorder", d), "-mno-xl-reorder", d)}" + " -mxl-reorder", " -mno-xl-reorder", d), \ + " -mxl-reorder", d), " -mno-xl-reorder", d)}" # Feature package architecture formatting MBPKGARCH_TUNE = "" diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc index a31516659c..cba0ae67e3 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" # Compiler args -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" # Set target fpu (bitbake known target) to soft or hard (basic or extended) TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc index 003fde3e07..6638accc98 100644 --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" # Version flags -TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" +TUNE_CCARGS .= "${@' -mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] microblaze tune: cleanup += 2020-01-31 23:33 ` [PATCH v2 2/2] microblaze tune: cleanup += Mark Hatle @ 2020-02-01 0:41 ` akuster808 2020-02-03 19:29 ` Mark Hatle 1 sibling, 0 replies; 9+ messages in thread From: akuster808 @ 2020-02-01 0:41 UTC (permalink / raw) To: Mark Hatle, openembedded-core On 1/31/20 3:33 PM, Mark Hatle wrote: > From: Mark Hatle <mark.hatle@xilinx.com> > > Various += were used, refactor these to be either = or .= depending on > usuage. what is in version 2? > > CONFLICTS should be '=', as no leading space is required and they are not > amending any other conflict settings. > > The TUNE_CCARGS should be .= so that if the feature does not define a CCARG > blank spaces are not added to the CFLAGS. This is consistent to how the arm > tuning is implemented. > > Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> > Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> > --- > .../include/microblaze/arch-microblaze.inc | 22 +++++++++---------- > .../microblaze/feature-microblaze-math.inc | 12 +++++----- > .../feature-microblaze-versions.inc | 2 +- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index fb777d929c..19cc2b59b9 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -9,34 +9,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze > > # Endian > TUNEVALID[bigendian] = "Use Microblaze Big Endian" > -TUNECONFLICTS[bigendian] += "v10.0" > +TUNECONFLICTS[bigendian] = "v10.0" > > MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" > > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" > > # General features > TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" > TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" > TUNEVALID[reorder] = "Enable Reorder Instructions" > -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" > +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" > > # Core configuration tune optimizations > TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" > -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > > # Feature compiler args > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" > > # Disable reorder for v8.30 if pattern-compare is not enabled > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > bb.utils.contains("TUNE_FEATURES", "v8.30", \ > bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ > - "-mxl-reorder", "-mno-xl-reorder", d), \ > - "-mxl-reorder", d), "-mno-xl-reorder", d)}" > + " -mxl-reorder", " -mno-xl-reorder", d), \ > + " -mxl-reorder", d), " -mno-xl-reorder", d)}" > > # Feature package architecture formatting > MBPKGARCH_TUNE = "" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > index a31516659c..cba0ae67e3 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" > TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" > > # Compiler args > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" > > # Set target fpu (bitbake known target) to soft or hard (basic or extended) > TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > index 003fde3e07..6638accc98 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 > TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" > > # Version flags > -TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > +TUNE_CCARGS .= "${@' -mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/2] microblaze tune: cleanup += 2020-01-31 23:33 ` [PATCH v2 2/2] microblaze tune: cleanup += Mark Hatle 2020-02-01 0:41 ` akuster808 @ 2020-02-03 19:29 ` Mark Hatle 1 sibling, 0 replies; 9+ messages in thread From: Mark Hatle @ 2020-02-03 19:29 UTC (permalink / raw) To: openembedded-core I just found a problem with this one in further testing. So please don't merge. There will be a v3. --Mark On 1/31/20 5:33 PM, Mark Hatle wrote: > From: Mark Hatle <mark.hatle@xilinx.com> > > Various += were used, refactor these to be either = or .= depending on > usuage. > > CONFLICTS should be '=', as no leading space is required and they are not > amending any other conflict settings. > > The TUNE_CCARGS should be .= so that if the feature does not define a CCARG > blank spaces are not added to the CFLAGS. This is consistent to how the arm > tuning is implemented. > > Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> > Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> > --- > .../include/microblaze/arch-microblaze.inc | 22 +++++++++---------- > .../microblaze/feature-microblaze-math.inc | 12 +++++----- > .../feature-microblaze-versions.inc | 2 +- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index fb777d929c..19cc2b59b9 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -9,34 +9,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze > > # Endian > TUNEVALID[bigendian] = "Use Microblaze Big Endian" > -TUNECONFLICTS[bigendian] += "v10.0" > +TUNECONFLICTS[bigendian] = "v10.0" > > MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" > > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}" > > # General features > TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" > TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" > TUNEVALID[reorder] = "Enable Reorder Instructions" > -TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" > +TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20" > > # Core configuration tune optimizations > TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" > -TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > +TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" > > # Feature compiler args > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}" > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}" > > # Disable reorder for v8.30 if pattern-compare is not enabled > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > bb.utils.contains("TUNE_FEATURES", "v8.30", \ > bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ > - "-mxl-reorder", "-mno-xl-reorder", d), \ > - "-mxl-reorder", d), "-mno-xl-reorder", d)}" > + " -mxl-reorder", " -mno-xl-reorder", d), \ > + " -mxl-reorder", d), " -mno-xl-reorder", d)}" > > # Feature package architecture formatting > MBPKGARCH_TUNE = "" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > index a31516659c..cba0ae67e3 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc > @@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft" > TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" > > # Compiler args > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}" > > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" > -TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}" > +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}" > > # Set target fpu (bitbake known target) to soft or hard (basic or extended) > TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" > diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > index 003fde3e07..6638accc98 100644 > --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc > @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 > TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0" > > # Version flags > -TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > +TUNE_CCARGS .= "${@' -mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}" > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] microblaze tune: Enable 64-bit 2020-01-31 23:33 [PATCH v2 1/2] microblaze tune: Enable 64-bit Mark Hatle 2020-01-31 23:33 ` [PATCH v2 2/2] microblaze tune: cleanup += Mark Hatle @ 2020-01-31 23:36 ` Mark Hatle 2020-02-01 0:02 ` ✗ patchtest: failure for "[v2] microblaze tune: Enable 6..." and 1 more Patchwork 2020-02-01 4:50 ` [PATCH v2 1/2] microblaze tune: Enable 64-bit Nathan Rossi 3 siblings, 0 replies; 9+ messages in thread From: Mark Hatle @ 2020-01-31 23:36 UTC (permalink / raw) To: openembedded-core If it wasn't clear (and isn't to patchtest), these require the previous microblaze tune commits I sent in order to apply. --Mark On 1/31/20 5:33 PM, Mark Hatle wrote: > From: Mark Hatle <mark.hatle@xilinx.com> > > 64-bit is not yet available in Linux, but some non-Linux uses exist. > > Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> > Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> > --- > meta/conf/machine/include/microblaze/arch-microblaze.inc | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index 265898b6b6..fb777d929c 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -4,6 +4,9 @@ > TUNEVALID[microblaze] = "MicroBlaze" > MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" > > +TUNEVALID[64-bit] = "64-bit MicroBlaze" > +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" > + > # Endian > TUNEVALID[bigendian] = "Use Microblaze Big Endian" > TUNECONFLICTS[bigendian] += "v10.0" > @@ -26,6 +29,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > > # Disable reorder for v8.30 if pattern-compare is not enabled > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > @@ -48,6 +52,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc > # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess > TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" > > +# Add 64-bit to the PKGARCH if enabled. > +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" > + > # Package Architecture formatting > -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* ✗ patchtest: failure for "[v2] microblaze tune: Enable 6..." and 1 more 2020-01-31 23:33 [PATCH v2 1/2] microblaze tune: Enable 64-bit Mark Hatle 2020-01-31 23:33 ` [PATCH v2 2/2] microblaze tune: cleanup += Mark Hatle 2020-01-31 23:36 ` [PATCH v2 1/2] microblaze tune: Enable 64-bit Mark Hatle @ 2020-02-01 0:02 ` Patchwork 2020-02-01 4:50 ` [PATCH v2 1/2] microblaze tune: Enable 64-bit Nathan Rossi 3 siblings, 0 replies; 9+ messages in thread From: Patchwork @ 2020-02-01 0:02 UTC (permalink / raw) To: Mark Hatle; +Cc: openembedded-core == Series Details == Series: "[v2] microblaze tune: Enable 6..." and 1 more Revision: 1 URL : https://patchwork.openembedded.org/series/22377/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fix Rebase your series on top of targeted branch Targeted branch master (currently at cd9006b202) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] microblaze tune: Enable 64-bit 2020-01-31 23:33 [PATCH v2 1/2] microblaze tune: Enable 64-bit Mark Hatle ` (2 preceding siblings ...) 2020-02-01 0:02 ` ✗ patchtest: failure for "[v2] microblaze tune: Enable 6..." and 1 more Patchwork @ 2020-02-01 4:50 ` Nathan Rossi 2020-02-03 18:36 ` Mark Hatle 3 siblings, 1 reply; 9+ messages in thread From: Nathan Rossi @ 2020-02-01 4:50 UTC (permalink / raw) To: Mark Hatle; +Cc: openembedded-core On Sat, 1 Feb 2020 at 09:33, Mark Hatle <mark.hatle@kernel.crashing.org> wrote: > > From: Mark Hatle <mark.hatle@xilinx.com> > > 64-bit is not yet available in Linux, but some non-Linux uses exist. > > Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> > Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> > --- > meta/conf/machine/include/microblaze/arch-microblaze.inc | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > index 265898b6b6..fb777d929c 100644 > --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > @@ -4,6 +4,9 @@ > TUNEVALID[microblaze] = "MicroBlaze" > MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" > > +TUNEVALID[64-bit] = "64-bit MicroBlaze" > +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" This should probably TUNECONFLICTS with all unsupported versions. Regards, Nathan > + > # Endian > TUNEVALID[bigendian] = "Use Microblaze Big Endian" > TUNECONFLICTS[bigendian] += "v10.0" > @@ -26,6 +29,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > > # Disable reorder for v8.30 if pattern-compare is not enabled > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > @@ -48,6 +52,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc > # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess > TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" > > +# Add 64-bit to the PKGARCH if enabled. > +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" > + > # Package Architecture formatting > -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] microblaze tune: Enable 64-bit 2020-02-01 4:50 ` [PATCH v2 1/2] microblaze tune: Enable 64-bit Nathan Rossi @ 2020-02-03 18:36 ` Mark Hatle 2020-02-04 6:52 ` Nathan Rossi 0 siblings, 1 reply; 9+ messages in thread From: Mark Hatle @ 2020-02-03 18:36 UTC (permalink / raw) To: Nathan Rossi; +Cc: openembedded-core On 1/31/20 10:50 PM, Nathan Rossi wrote: > On Sat, 1 Feb 2020 at 09:33, Mark Hatle <mark.hatle@kernel.crashing.org> wrote: >> >> From: Mark Hatle <mark.hatle@xilinx.com> >> >> 64-bit is not yet available in Linux, but some non-Linux uses exist. >> >> Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> >> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> >> --- >> meta/conf/machine/include/microblaze/arch-microblaze.inc | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc >> index 265898b6b6..fb777d929c 100644 >> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc >> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc >> @@ -4,6 +4,9 @@ >> TUNEVALID[microblaze] = "MicroBlaze" >> MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" >> >> +TUNEVALID[64-bit] = "64-bit MicroBlaze" >> +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" > > This should probably TUNECONFLICTS with all unsupported versions. I have no information on what versions are unsupported with 64-bit. If I receive that information, I will add it as conflicts. --Mark > Regards, > Nathan > > >> + >> # Endian >> TUNEVALID[bigendian] = "Use Microblaze Big Endian" >> TUNECONFLICTS[bigendian] += "v10.0" >> @@ -26,6 +29,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" >> +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" >> >> # Disable reorder for v8.30 if pattern-compare is not enabled >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ >> @@ -48,6 +52,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc >> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess >> TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" >> >> +# Add 64-bit to the PKGARCH if enabled. >> +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" >> + >> # Package Architecture formatting >> -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" >> +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" >> >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/2] microblaze tune: Enable 64-bit 2020-02-03 18:36 ` Mark Hatle @ 2020-02-04 6:52 ` Nathan Rossi 0 siblings, 0 replies; 9+ messages in thread From: Nathan Rossi @ 2020-02-04 6:52 UTC (permalink / raw) To: Mark Hatle; +Cc: openembedded-core On Tue, 4 Feb 2020 at 04:36, Mark Hatle <mark.hatle@kernel.crashing.org> wrote: > > > > On 1/31/20 10:50 PM, Nathan Rossi wrote: > > On Sat, 1 Feb 2020 at 09:33, Mark Hatle <mark.hatle@kernel.crashing.org> wrote: > >> > >> From: Mark Hatle <mark.hatle@xilinx.com> > >> > >> 64-bit is not yet available in Linux, but some non-Linux uses exist. > >> > >> Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> > >> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> > >> --- > >> meta/conf/machine/include/microblaze/arch-microblaze.inc | 9 ++++++++- > >> 1 file changed, 8 insertions(+), 1 deletion(-) > >> > >> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> index 265898b6b6..fb777d929c 100644 > >> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc > >> @@ -4,6 +4,9 @@ > >> TUNEVALID[microblaze] = "MicroBlaze" > >> MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "", d)}" > >> > >> +TUNEVALID[64-bit] = "64-bit MicroBlaze" > >> +MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze64:", "", d)}" > > > > This should probably TUNECONFLICTS with all unsupported versions. > > I have no information on what versions are unsupported with 64-bit. If I > receive that information, I will add it as conflicts. It looks like it was added in v11.0 (and unsupported in all prior versions), according to the microblaze reference manual (https://www.xilinx.com/support/documentation/sw_manuals/xilinx2019_2/ug984-vivado-microblaze-ref.pdf). Regards, Nathan > > --Mark > > > Regards, > > Nathan > > > > > >> + > >> # Endian > >> TUNEVALID[bigendian] = "Use Microblaze Big Endian" > >> TUNECONFLICTS[bigendian] += "v10.0" > >> @@ -26,6 +29,7 @@ TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 > >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" > >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" > >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" > >> +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" > >> > >> # Disable reorder for v8.30 if pattern-compare is not enabled > >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ > >> @@ -48,6 +52,9 @@ require conf/machine/include/microblaze/feature-microblaze-math.inc > >> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess > >> TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}" > >> > >> +# Add 64-bit to the PKGARCH if enabled. > >> +MBPKGARCH_SIZE = "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "64", "", d)}" > >> + > >> # Package Architecture formatting > >> -TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > >> +TUNE_PKGARCH = "microblaze${MBPKGARCH_SIZE}${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}" > >> > >> -- > >> 2.17.1 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core@lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-02-04 6:52 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-01-31 23:33 [PATCH v2 1/2] microblaze tune: Enable 64-bit Mark Hatle 2020-01-31 23:33 ` [PATCH v2 2/2] microblaze tune: cleanup += Mark Hatle 2020-02-01 0:41 ` akuster808 2020-02-03 19:29 ` Mark Hatle 2020-01-31 23:36 ` [PATCH v2 1/2] microblaze tune: Enable 64-bit Mark Hatle 2020-02-01 0:02 ` ✗ patchtest: failure for "[v2] microblaze tune: Enable 6..." and 1 more Patchwork 2020-02-01 4:50 ` [PATCH v2 1/2] microblaze tune: Enable 64-bit Nathan Rossi 2020-02-03 18:36 ` Mark Hatle 2020-02-04 6:52 ` Nathan Rossi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox