2017-08-25 16:32:30

by Colin King

[permalink] [raw]
Subject: [PATCH] x86/platform/intel-mid: make several arrays static, makes code smaller

From: Colin Ian King <[email protected]>

Don't populate arrays on the stack, instead make them static .
Makes the object code smaller by 76 bytes:

Before:
text data bss dec hex filename
4217 1540 128 5885 16fd arch/x86/platform/intel-mid/pwr.o

After:
text data bss dec hex filename
3981 1700 128 5809 16b1 arch/x86/platform/intel-mid/pwr.o

Signed-off-by: Colin Ian King <[email protected]>
---
arch/x86/platform/intel-mid/pwr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/platform/intel-mid/pwr.c b/arch/x86/platform/intel-mid/pwr.c
index ef03852ea6e8..49ec5b94c71f 100644
--- a/arch/x86/platform/intel-mid/pwr.c
+++ b/arch/x86/platform/intel-mid/pwr.c
@@ -444,7 +444,7 @@ static int mid_set_initial_state(struct mid_pwr *pwr, const u32 *states)
static int pnw_set_initial_state(struct mid_pwr *pwr)
{
/* On Penwell SRAM must stay powered on */
- const u32 states[] = {
+ static const u32 states[] = {
0xf00fffff, /* PM_SSC(0) */
0xffffffff, /* PM_SSC(1) */
0xffffffff, /* PM_SSC(2) */
@@ -455,7 +455,7 @@ static int pnw_set_initial_state(struct mid_pwr *pwr)

static int tng_set_initial_state(struct mid_pwr *pwr)
{
- const u32 states[] = {
+ static const u32 states[] = {
0xffffffff, /* PM_SSC(0) */
0xffffffff, /* PM_SSC(1) */
0xffffffff, /* PM_SSC(2) */
--
2.14.1


2017-08-25 16:53:39

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH] x86/platform/intel-mid: make several arrays static, makes code smaller

On Fri, 2017-08-25 at 17:32 +0100, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Don't populate arrays on the stack, instead make them static .
> Makes the object code smaller by 76 bytes:
>
> Before:
>    text    data     bss     dec     hex
> filename
>    4217    1540     128    5885    16fd
> arch/x86/platform/intel-mid/pwr.o
>
> After:
>    text    data     bss     dec     hex
> filename
>    3981    1700     128    5809    16b1
> arch/x86/platform/intel-mid/pwr.o

Fine by me.

Reviewed-by: Andy Shevchenko <[email protected]>

>
> Signed-off-by: Colin Ian King <[email protected]>
> ---
>  arch/x86/platform/intel-mid/pwr.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/platform/intel-mid/pwr.c
> b/arch/x86/platform/intel-mid/pwr.c
> index ef03852ea6e8..49ec5b94c71f 100644
> --- a/arch/x86/platform/intel-mid/pwr.c
> +++ b/arch/x86/platform/intel-mid/pwr.c
> @@ -444,7 +444,7 @@ static int mid_set_initial_state(struct mid_pwr
> *pwr, const u32 *states)
>  static int pnw_set_initial_state(struct mid_pwr *pwr)
>  {
>   /* On Penwell SRAM must stay powered on */
> - const u32 states[] = {
> + static const u32 states[] = {
>   0xf00fffff, /* PM_SSC(0) */
>   0xffffffff, /* PM_SSC(1) */
>   0xffffffff, /* PM_SSC(2) */
> @@ -455,7 +455,7 @@ static int pnw_set_initial_state(struct mid_pwr
> *pwr)
>  
>  static int tng_set_initial_state(struct mid_pwr *pwr)
>  {
> - const u32 states[] = {
> + static const u32 states[] = {
>   0xffffffff, /* PM_SSC(0) */
>   0xffffffff, /* PM_SSC(1) */
>   0xffffffff, /* PM_SSC(2) */

--
Andy Shevchenko <[email protected]>
Intel Finland Oy

2017-08-25 17:57:42

by Lukas Wunner

[permalink] [raw]
Subject: Re: [PATCH] x86/platform/intel-mid: make several arrays static, makes code smaller

On Fri, Aug 25, 2017 at 05:32:06PM +0100, Colin King wrote:
> --- a/arch/x86/platform/intel-mid/pwr.c
> +++ b/arch/x86/platform/intel-mid/pwr.c
> @@ -444,7 +444,7 @@ static int mid_set_initial_state(struct mid_pwr *pwr, const u32 *states)
> static int pnw_set_initial_state(struct mid_pwr *pwr)
> {
> /* On Penwell SRAM must stay powered on */
> - const u32 states[] = {
> + static const u32 states[] = {
> 0xf00fffff, /* PM_SSC(0) */
> 0xffffffff, /* PM_SSC(1) */
> 0xffffffff, /* PM_SSC(2) */

That's a known gcc bug:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68725

There are hundreds of constant compound literals that are generated
on the stack rather than stored in rodata, do you intend to file
patches for all of them? Adding static everywhere is just a
workaround that bloats the code. Fixing the root cause in gcc would
make more sense.

Just my 2 cents worth of course.

Thanks,

Lukas

2017-08-25 17:59:56

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH] x86/platform/intel-mid: make several arrays static, makes code smaller

On Fri, 2017-08-25 at 19:51 +0200, Lukas Wunner wrote:
> On Fri, Aug 25, 2017 at 05:32:06PM +0100, Colin King wrote:
> > --- a/arch/x86/platform/intel-mid/pwr.c
> > +++ b/arch/x86/platform/intel-mid/pwr.c
> > @@ -444,7 +444,7 @@ static int mid_set_initial_state(struct mid_pwr
> > *pwr, const u32 *states)
> >  static int pnw_set_initial_state(struct mid_pwr *pwr)
> >  {
> >   /* On Penwell SRAM must stay powered on */
> > - const u32 states[] = {
> > + static const u32 states[] = {
> >   0xf00fffff, /* PM_SSC(0) */
> >   0xffffffff, /* PM_SSC(1) */
> >   0xffffffff, /* PM_SSC(2) */
>
> That's a known gcc bug:
> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68725
>
> There are hundreds of constant compound literals that are generated
> on the stack rather than stored in rodata, do you intend to file
> patches for all of them?  Adding static everywhere is just a
> workaround that bloats the code.  Fixing the root cause in gcc would
> make more sense.

That is a good point.

--
Andy Shevchenko <[email protected]>
Intel Finland Oy

2017-08-25 18:13:53

by Colin King

[permalink] [raw]
Subject: Re: [PATCH] x86/platform/intel-mid: make several arrays static, makes code smaller

On 25/08/17 18:53, Andy Shevchenko wrote:
> On Fri, 2017-08-25 at 19:51 +0200, Lukas Wunner wrote:
>> On Fri, Aug 25, 2017 at 05:32:06PM +0100, Colin King wrote:
>>> --- a/arch/x86/platform/intel-mid/pwr.c
>>> +++ b/arch/x86/platform/intel-mid/pwr.c
>>> @@ -444,7 +444,7 @@ static int mid_set_initial_state(struct mid_pwr
>>> *pwr, const u32 *states)
>>> static int pnw_set_initial_state(struct mid_pwr *pwr)
>>> {
>>> /* On Penwell SRAM must stay powered on */
>>> - const u32 states[] = {
>>> + static const u32 states[] = {
>>> 0xf00fffff, /* PM_SSC(0) */
>>> 0xffffffff, /* PM_SSC(1) */
>>> 0xffffffff, /* PM_SSC(2) */
>>
>> That's a known gcc bug:
>> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68725
>>
>> There are hundreds of constant compound literals that are generated
>> on the stack rather than stored in rodata, do you intend to file
>> patches for all of them? Adding static everywhere is just a
>> workaround that bloats the code. Fixing the root cause in gcc would
>> make more sense.

Hrm. constifying will specify it won't be changed; section A8.2 of "The
C programming language" 2nd edition states that this specifier "is to
announce that objects may be placed in read-only memory, and perhaps
increase opportunities for optimization". Emphasis on "may", it can do,
but it does not necessarily have to. The static storage class specifier
will ensure the object is not on the stack for sure. So I think from my
understanding of the semantics described in K&R 2nd edition:

const - data is read only, and can be put into read-only location if
compiler can (or wants) to do so
static - data will be not stashed on the stack.

So my change is to be totally clear on the intent - make it read only
and ensure it is not populated at run time on the stack.

Colin

>
> That is a good point.
>

Subject: [tip:x86/platform] x86/platform/intel-mid: Make several arrays static, to make code smaller

Commit-ID: 3308376a914b9c3f57a12072c063814403d983a8
Gitweb: http://git.kernel.org/tip/3308376a914b9c3f57a12072c063814403d983a8
Author: Colin Ian King <[email protected]>
AuthorDate: Fri, 25 Aug 2017 17:32:06 +0100
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 29 Aug 2017 13:30:16 +0200

x86/platform/intel-mid: Make several arrays static, to make code smaller

Don't populate arrays on the stack, instead make them static.
Makes the object code smaller by 76 bytes:

Before:
text data bss dec hex filename
4217 1540 128 5885 16fd arch/x86/platform/intel-mid/pwr.o

After:
text data bss dec hex filename
3981 1700 128 5809 16b1 arch/x86/platform/intel-mid/pwr.o

Signed-off-by: Colin Ian King <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Lukas Wunner <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/platform/intel-mid/pwr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/platform/intel-mid/pwr.c b/arch/x86/platform/intel-mid/pwr.c
index ef03852..49ec5b9 100644
--- a/arch/x86/platform/intel-mid/pwr.c
+++ b/arch/x86/platform/intel-mid/pwr.c
@@ -444,7 +444,7 @@ static int mid_set_initial_state(struct mid_pwr *pwr, const u32 *states)
static int pnw_set_initial_state(struct mid_pwr *pwr)
{
/* On Penwell SRAM must stay powered on */
- const u32 states[] = {
+ static const u32 states[] = {
0xf00fffff, /* PM_SSC(0) */
0xffffffff, /* PM_SSC(1) */
0xffffffff, /* PM_SSC(2) */
@@ -455,7 +455,7 @@ static int pnw_set_initial_state(struct mid_pwr *pwr)

static int tng_set_initial_state(struct mid_pwr *pwr)
{
- const u32 states[] = {
+ static const u32 states[] = {
0xffffffff, /* PM_SSC(0) */
0xffffffff, /* PM_SSC(1) */
0xffffffff, /* PM_SSC(2) */