| Message ID | 20220826135503.20612-12-jesseevg@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Extend Qt6 configuration | expand |
On Fri, 26 Aug 2022 15:54:45 +0200 Jesse Van Gavere <jesseevg@gmail.com> wrote: > Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com> > --- > package/qt6/qt6base/qt6base.mk | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index 21c15607d6..8bca29900e 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -35,6 +35,25 @@ QT6BASE_CONF_OPTS = \ > -DFEATURE_system_zlib=ON \ > -DFEATURE_system_libb2=ON > > +QT6BASE_CONF_OPTS += -DFEATURE_sse2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) > +QT6BASE_CONF_OPTS += -DFEATURE_sse3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) > +QT6BASE_CONF_OPTS += -DFEATURE_sse4_1=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) > +QT6BASE_CONF_OPTS += -DFEATURE_sse4_2=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) > +QT6BASE_CONF_OPTS += -DFEATURE_ssse3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) > +QT6BASE_CONF_OPTS += -DFEATURE_avx=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) > +QT6BASE_CONF_OPTS += -DFEATURE_avx2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) > +# no buildroot BR2_X86_CPU_HAS_AVX512 option yet This is not true: we do have a BR2_X86_CPU_HAS_AVX512 option, but my understanding of AVX512 is too limited to know how that maps to those individual avx512xyz options, so I kept them disabled as you did, but with a different explanation. Also, I grouped the whole thing into a single assignment to QT6BASE_CONF_OPTS. And of course applied the result: https://gitlab.com/buildroot.org/buildroot/-/commit/3b395c1574299147b41602aa471a76c98db9a1cc Thanks! Thomas
Op zo 18 sep. 2022 om 11:57 schreef Thomas Petazzoni <thomas.petazzoni@bootlin.com>: > > On Fri, 26 Aug 2022 15:54:45 +0200 > Jesse Van Gavere <jesseevg@gmail.com> wrote: > > > Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com> > > --- > > package/qt6/qt6base/qt6base.mk | 19 +++++++++++++++++++ > > 1 file changed, 19 insertions(+) > > > > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > > index 21c15607d6..8bca29900e 100644 > > --- a/package/qt6/qt6base/qt6base.mk > > +++ b/package/qt6/qt6base/qt6base.mk > > @@ -35,6 +35,25 @@ QT6BASE_CONF_OPTS = \ > > -DFEATURE_system_zlib=ON \ > > -DFEATURE_system_libb2=ON > > > > +QT6BASE_CONF_OPTS += -DFEATURE_sse2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) > > +QT6BASE_CONF_OPTS += -DFEATURE_sse3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) > > +QT6BASE_CONF_OPTS += -DFEATURE_sse4_1=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) > > +QT6BASE_CONF_OPTS += -DFEATURE_sse4_2=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) > > +QT6BASE_CONF_OPTS += -DFEATURE_ssse3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) > > +QT6BASE_CONF_OPTS += -DFEATURE_avx=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) > > +QT6BASE_CONF_OPTS += -DFEATURE_avx2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) > > +# no buildroot BR2_X86_CPU_HAS_AVX512 option yet > > This is not true: we do have a BR2_X86_CPU_HAS_AVX512 option, but my > understanding of AVX512 is too limited to know how that maps to those > individual avx512xyz options, so I kept them disabled as you did, but > with a different explanation. > > Also, I grouped the whole thing into a single assignment to > QT6BASE_CONF_OPTS. > > And of course applied the result: > > https://gitlab.com/buildroot.org/buildroot/-/commit/3b395c1574299147b41602aa471a76c98db9a1cc > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Hey Thomas, You're right! I missed that being added and it didn't exist at the time I started working on it so I'll see if I can revisit this topic later on. Regards, Jesse
diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 21c15607d6..8bca29900e 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -35,6 +35,25 @@ QT6BASE_CONF_OPTS = \ -DFEATURE_system_zlib=ON \ -DFEATURE_system_libb2=ON +QT6BASE_CONF_OPTS += -DFEATURE_sse2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_sse3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_sse4_1=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_sse4_2=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_ssse3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_avx=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) +QT6BASE_CONF_OPTS += -DFEATURE_avx2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) +# no buildroot BR2_X86_CPU_HAS_AVX512 option yet +QT6BASE_CONF_OPTS += \ + -DFEATURE_avx512bw=OFF \ + -DFEATURE_avx512cd=OFF \ + -DFEATURE_avx512dq=OFF \ + -DFEATURE_avx512er=OFF \ + -DFEATURE_avx512f=OFF \ + -DFEATURE_avx512ifma=OFF \ + -DFEATURE_avx512pf=OFF \ + -DFEATURE_avx512vbmi=OFF \ + -DFEATURE_avx512vl=OFF + define QT6BASE_BUILD_CMDS $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) endef
Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com> --- package/qt6/qt6base/qt6base.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)