dwarves/pahole.c

1108 lines
30 KiB
C
Raw Normal View History

/*
Copyright (C) 2006 Mandriva Conectiva S.A.
Copyright (C) 2006 Arnaldo Carvalho de Melo <acme@mandriva.com>
Copyright (C) 2007 Arnaldo Carvalho de Melo <acme@redhat.com>
This program is free software; you can redistribute it and/or modify it
under the terms of version 2 of the GNU General Public License as
published by the Free Software Foundation.
*/
#include <getopt.h>
#include <stdio.h>
#include <dwarf.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "dwarves.h"
static uint8_t class__include_anonymous;
static uint8_t class__include_nested_anonymous;
static char *class__exclude_prefix;
static size_t class__exclude_prefix_len;
static char *cu__exclude_prefix;
static size_t cu__exclude_prefix_len;
static char *decl_exclude_prefix;
static size_t decl_exclude_prefix_len;
static uint16_t nr_holes;
static uint16_t nr_bit_holes;
static uint8_t show_packable;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
static uint8_t global_verbose;
[PAHOLE]: Implement type expansion What is in a struct... [acme@filo pahole]$ pahole net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct work; /* 0 16 */ struct timer_list timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Oh, but what if we want to unfold all the structs? lo pahole]$ pahole --expand_types /home/acme/git/OUTPUT/qemu/linux-2.6/net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct { atomic_long_t data; /* 0 4 */ struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 4 8 */ work_func_t func; /* 12 4 */ } work; /* 0 16 */ struct timer_list { struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 0 8 */ long unsigned int expires; /* 8 4 */ void (*function)(long unsigned int); /* 12 4 */ long unsigned int data; /* 16 4 */ struct tvec_t_base_s * base; /* 20 4 */ } timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Quick hack, as we already had all the needed infrastructure due to anonymous struct printing inside structs/unions, now for the curious, if you have the kernel-debuginfo package installed in your FC6 machine: [acme@filo pahole]$ pahole --expand_types /usr/lib/debug/lib/modules/2.6.19-1.2895.fc6/kernel/net/ipv6/ipv6.ko.debug tcp6_sock Try struct task_struct too 8-) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-01-29 16:12:23 +01:00
static uint8_t expand_types;
struct structure {
struct list_head node;
const struct class *class;
const struct cu *cu;
uint32_t nr_files;
uint32_t nr_methods;
};
static struct structure *structure__new(const struct class *class,
const struct cu *cu)
{
struct structure *self = malloc(sizeof(*self));
if (self != NULL) {
self->class = class;
self->cu = cu;
self->nr_files = 1;
self->nr_methods = 0;
}
return self;
}
static LIST_HEAD(structures__list);
static struct structure *structures__find(const char *name)
{
struct structure *pos;
if (name == NULL)
return NULL;
list_for_each_entry(pos, &structures__list, node) {
const char *class_name = class__name(pos->class);
if (class_name != NULL &&
strcmp(class__name(pos->class), name) == 0)
return pos;
}
return NULL;
}
static void structures__add(const struct class *class, const struct cu *cu)
{
struct structure *str = structure__new(class, cu);
if (str != NULL)
list_add(&str->node, &structures__list);
}
static void nr_definitions_formatter(const struct structure *self)
{
printf("%s: %u\n", class__name(self->class), self->nr_files);
}
static void nr_members_formatter(const struct structure *self)
{
printf("%s: %u\n", class__name(self->class),
class__nr_members(self->class));
}
static void nr_methods_formatter(const struct structure *self)
{
printf("%s: %u\n", class__name(self->class), self->nr_methods);
}
static void size_formatter(const struct structure *self)
{
printf("%s: %u %u\n", class__name(self->class),
class__size(self->class), self->class->nr_holes);
}
static void class_name_len_formatter(const struct structure *self)
{
const char *name = class__name(self->class);
printf("%s: %u\n", name, strlen(name));
}
static void class_formatter(const struct structure *self)
{
struct tag *typedef_alias = NULL;
struct tag *tag = class__tag(self->class);
const char *name = class__name(self->class);
if (name == NULL) {
/*
* Find the first typedef for this struct, this is enough
* as if we optimize the struct all the typedefs will be
* affected.
*/
typedef_alias = cu__find_first_typedef_of_type(self->cu,
tag->id);
/*
* If there is no typedefs for this anonymous struct it is
* found just inside another struct, and in this case it'll
* be printed when the type it is in is printed, but if
* the user still wants to see its statistics, just use
* --nested_anon_include.
*/
if (typedef_alias == NULL && !class__include_nested_anonymous)
return;
}
if (typedef_alias != NULL) {
const struct type *tdef = tag__type(typedef_alias);
[PAHOLE]: Implement type expansion What is in a struct... [acme@filo pahole]$ pahole net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct work; /* 0 16 */ struct timer_list timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Oh, but what if we want to unfold all the structs? lo pahole]$ pahole --expand_types /home/acme/git/OUTPUT/qemu/linux-2.6/net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct { atomic_long_t data; /* 0 4 */ struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 4 8 */ work_func_t func; /* 12 4 */ } work; /* 0 16 */ struct timer_list { struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 0 8 */ long unsigned int expires; /* 8 4 */ void (*function)(long unsigned int); /* 12 4 */ long unsigned int data; /* 16 4 */ struct tvec_t_base_s * base; /* 20 4 */ } timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Quick hack, as we already had all the needed infrastructure due to anonymous struct printing inside structs/unions, now for the curious, if you have the kernel-debuginfo package installed in your FC6 machine: [acme@filo pahole]$ pahole --expand_types /usr/lib/debug/lib/modules/2.6.19-1.2895.fc6/kernel/net/ipv6/ipv6.ko.debug tcp6_sock Try struct task_struct too 8-) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-01-29 16:12:23 +01:00
tag__print(tag, self->cu, "typedef", tdef->name, expand_types);
} else
[PAHOLE]: Implement type expansion What is in a struct... [acme@filo pahole]$ pahole net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct work; /* 0 16 */ struct timer_list timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Oh, but what if we want to unfold all the structs? lo pahole]$ pahole --expand_types /home/acme/git/OUTPUT/qemu/linux-2.6/net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct { atomic_long_t data; /* 0 4 */ struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 4 8 */ work_func_t func; /* 12 4 */ } work; /* 0 16 */ struct timer_list { struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 0 8 */ long unsigned int expires; /* 8 4 */ void (*function)(long unsigned int); /* 12 4 */ long unsigned int data; /* 16 4 */ struct tvec_t_base_s * base; /* 20 4 */ } timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Quick hack, as we already had all the needed infrastructure due to anonymous struct printing inside structs/unions, now for the curious, if you have the kernel-debuginfo package installed in your FC6 machine: [acme@filo pahole]$ pahole --expand_types /usr/lib/debug/lib/modules/2.6.19-1.2895.fc6/kernel/net/ipv6/ipv6.ko.debug tcp6_sock Try struct task_struct too 8-) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-01-29 16:12:23 +01:00
tag__print(tag, self->cu, NULL, NULL, expand_types);
printf(" /* definitions: %u */\n", self->nr_files);
putchar('\n');
}
static void print_classes(void (*formatter)(const struct structure *s))
{
struct structure *pos;
list_for_each_entry(pos, &structures__list, node)
formatter(pos);
}
static struct cu *cu__filter(struct cu *cu)
{
if (cu__exclude_prefix != NULL &&
(cu->name == NULL ||
strncmp(cu__exclude_prefix, cu->name,
cu__exclude_prefix_len) == 0))
return NULL;
return cu;
}
static int class__packable(const struct class *self)
{
struct class_member *pos;
if (self->nr_holes == 0 && self->nr_bit_holes == 0)
return 0;
list_for_each_entry(pos, &self->type.members, tag.node)
if (pos->hole != 0 &&
class__find_bit_hole(self, pos, pos->hole * 8) != NULL)
return 1;
else if (pos->bit_hole != 0 &&
class__find_bit_hole(self, pos, pos->bit_hole) != NULL)
return 1;
return 0;
}
static void class__dupmsg(const struct class *self, const struct cu *cu,
const struct class *dup __unused,
const struct cu *dup_cu,
char *hdr, const char *fmt, ...)
{
va_list args;
if (!*hdr)
printf("class: %s\nfirst: %s\ncurrent: %s\n",
class__name(self), cu->name, dup_cu->name);
va_start(args, fmt);
vprintf(fmt, args);
va_end(args);
*hdr = 1;
}
static void class__chkdupdef(const struct class *self, const struct cu *cu,
struct class *dup, const struct cu *dup_cu)
{
char hdr = 0;
if (class__size(self) != class__size(dup))
class__dupmsg(self, cu, dup, dup_cu,
&hdr, "size: %u != %u\n",
class__size(self), class__size(dup));
if (class__nr_members(self) != class__nr_members(dup))
class__dupmsg(self, cu, dup, dup_cu,
&hdr, "nr_members: %u != %u\n",
class__nr_members(self), class__nr_members(dup));
if (self->nr_holes != dup->nr_holes)
class__dupmsg(self, cu, dup, dup_cu,
&hdr, "nr_holes: %u != %u\n",
self->nr_holes, dup->nr_holes);
if (self->nr_bit_holes != dup->nr_bit_holes)
class__dupmsg(self, cu, dup, dup_cu,
&hdr, "nr_bit_holes: %u != %u\n",
self->nr_bit_holes, dup->nr_bit_holes);
if (self->padding != dup->padding)
class__dupmsg(self, cu, dup, dup_cu,
&hdr, "padding: %u != %u\n",
self->padding, dup->padding);
/* XXX put more checks here: member types, member ordering, etc */
if (hdr)
putchar('\n');
}
static struct tag *tag__filter(struct tag *tag, struct cu *cu,
void *cookie __unused)
{
struct structure *str;
struct class *class;
const char *name;
if (tag->tag != DW_TAG_structure_type)
return NULL;
class = tag__class(tag);
name = class__name(class);
if (class__is_declaration(class))
return NULL;
if (!class__include_anonymous && name == NULL)
return NULL;
if (class__exclude_prefix != NULL && name &&
strncmp(class__exclude_prefix, name,
class__exclude_prefix_len) == 0)
return NULL;
if (decl_exclude_prefix != NULL &&
(tag->decl_file == NULL ||
strncmp(decl_exclude_prefix, tag->decl_file,
decl_exclude_prefix_len) == 0))
return NULL;
class__find_holes(class, cu);
if (class->nr_holes < nr_holes ||
class->nr_bit_holes < nr_bit_holes)
return NULL;
str = structures__find(name);
if (str != NULL) {
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
if (global_verbose)
class__chkdupdef(str->class, str->cu, class, cu);
str->nr_files++;
return NULL;
}
if (show_packable && !class__packable(class))
return NULL;
return tag;
}
static int unique_iterator(struct tag *tag, struct cu *cu,
void *cookie __unused)
{
structures__add(tag__class(tag), cu);
return 0;
}
static int cu_unique_iterator(struct cu *cu, void *cookie)
{
return cu__for_each_tag(cu, unique_iterator, cookie, tag__filter);
}
static struct tag *nr_methods__filter(struct tag *tag, struct cu *cu __unused,
void *cookie __unused)
{
if (tag->tag != DW_TAG_subprogram)
return NULL;
if (function__declared_inline(tag__function(tag)))
return NULL;
return tag;
}
static int nr_methods_iterator(struct tag *tag, struct cu *cu,
void *cookie __unused)
{
struct parameter *pos;
struct structure *str;
struct type *ctype;
list_for_each_entry(pos, &tag__ftype(tag)->parms, tag.node) {
struct tag *type =
cu__find_tag_by_id(cu, parameter__type(pos, cu));
if (type == NULL || type->tag != DW_TAG_pointer_type)
continue;
type = cu__find_tag_by_id(cu, type->type);
if (type == NULL || type->tag != DW_TAG_structure_type)
continue;
ctype = tag__type(type);
if (ctype->name == NULL)
continue;
str = structures__find(ctype->name);
if (str != NULL)
++str->nr_methods;
}
return 0;
}
static int cu_nr_methods_iterator(struct cu *cu, void *cookie)
{
return cu__for_each_tag(cu, nr_methods_iterator, cookie,
nr_methods__filter);
}
static struct class_member *
class__find_next_hole_of_size(struct class *class,
struct class_member *from,
const struct cu *cu, size_t size)
{
struct class_member *member =
list_prepare_entry(from, &class->type.members, tag.node);
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
struct class_member *bitfield_head = NULL;
list_for_each_entry_continue(member, &class->type.members, tag.node) {
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
if (member->bit_size != 0) {
if (bitfield_head == NULL)
bitfield_head = member;
} else
bitfield_head = NULL;
if (member->hole != 0 &&
class_member__size(member, cu) <= size)
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
return bitfield_head ? : member;
}
return NULL;
}
static struct class_member *
class__find_next_bit_hole_of_size(const struct class *class,
struct class_member *from,
size_t size)
{
struct class_member *member =
list_prepare_entry(from, &class->type.members, tag.node);
list_for_each_entry_continue(member, &class->type.members, tag.node)
if (member->bit_hole != 0 &&
member->bit_size <= size)
return member;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
/*
* Now look if the last member is a one member bitfield,
* i.e. if we have bit_padding
*/
if (class->bit_padding != 0)
return list_entry(class->type.members.prev,
struct class_member, tag.node);
return NULL;
}
static void class__subtract_offsets_from(struct class *class,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
const struct cu *cu,
struct class_member *from,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
const uint16_t size)
{
struct class_member *member =
list_prepare_entry(from, &class->type.members, tag.node);
list_for_each_entry_continue(member, &class->type.members, tag.node)
member->offset -= size;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
if (class->padding != 0) {
struct class_member *last_member =
list_entry(class->type.members.prev,
struct class_member, tag.node);
const size_t last_member_size =
class_member__size(last_member, cu);
const ssize_t new_padding =
(class__size(class) -
(last_member->offset + last_member_size));
if (new_padding > 0)
class->padding = new_padding;
else
class->padding = 0;
}
}
static void class__move_member(struct class *class, struct class_member *dest,
struct class_member *from, const struct cu *cu,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
int from_padding, const int verbose)
{
const size_t from_size = class_member__size(from, cu);
const size_t dest_size = class_member__size(dest, cu);
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
struct class_member *tail_from = from;
struct class_member *from_prev = list_entry(from->tag.node.prev,
struct class_member,
tag.node);
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
uint16_t orig_tail_from_hole = tail_from->hole;
const uint16_t orig_from_offset = from->offset;
/*
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
* Align 'from' after 'dest':
*/
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
const uint16_t offset = dest->hole % from_size;
/*
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
* Set new 'from' offset, after 'dest->offset', aligned
*/
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
const uint16_t new_from_offset = dest->offset + dest_size + offset;
if (verbose)
fputs("/* Moving", stdout);
if (from->bit_size != 0) {
struct class_member *pos =
list_prepare_entry(from, &class->type.members,
tag.node);
struct class_member *tmp;
uint8_t orig_tail_from_bit_hole;
LIST_HEAD(from_list);
if (verbose)
printf(" bitfield('%s' ... ", from->name);
list_for_each_entry_safe_from(pos, tmp, &class->type.members,
tag.node) {
/*
* Have we reached the end of the bitfield?
*/
if (pos->offset != orig_from_offset)
break;
tail_from = pos;
orig_tail_from_hole = tail_from->hole;
orig_tail_from_bit_hole = tail_from->bit_hole;
pos->offset = new_from_offset;
pos->hole = 0;
pos->bit_hole = 0;
list_move_tail(&pos->tag.node, &from_list);
}
tail_from->bit_hole = orig_tail_from_bit_hole;
list_splice(&from_list, &dest->tag.node);
if (verbose)
printf("'%s')", tail_from->name);
} else {
if (verbose)
printf(" '%s'", from->name);
/*
* Remove 'from' from the list
*/
list_del(&from->tag.node);
/*
* Add 'from' after 'dest':
*/
__list_add(&from->tag.node, &dest->tag.node,
dest->tag.node.next);
from->offset = new_from_offset;
}
if (verbose)
printf(" from after '%s' to after '%s' */\n",
from_prev->name, dest->name);
if (from_padding) {
/*
* Check if we're eliminating the need for padding:
*/
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
if (orig_from_offset % cu->addr_size == 0) {
/*
* Good, no need for padding anymore:
*/
class->type.size -= from_size + class->padding;
class->padding = 0;
} else {
/*
* No, so just add from_size to the padding:
*/
class->padding += from_size;
printf("adding %zd bytes from %s to the padding\n",
from_size, from->name);
}
} else {
/*
* See if we are adding a new hole that is bigger than
* sizeof(long), this may have problems with explicit alignment
* made by the programmer, perhaps we need A switch that allows
* us to avoid realignment, just using existing holes but
* keeping the existing alignment, anyway the programmer has to
* check the resulting rerganization before using it, and for
* automatic stuff such as the one that will be used for struct
* "views" in tools such as ctracer we are more interested in
* packing the subset as tightly as possible.
*/
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
if (orig_tail_from_hole + from_size >= cu->addr_size) {
class->type.size -= cu->addr_size;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
class__subtract_offsets_from(class, cu, from_prev,
cu->addr_size);
} else {
/*
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
* Add the hole after 'from' + its size to the member
* before it:
*/
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
from_prev->hole += orig_tail_from_hole + from_size;
}
/*
* Check if we have eliminated a hole
*/
if (dest->hole == from_size)
class->nr_holes--;
}
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
tail_from->hole = dest->hole - (from_size + offset);
dest->hole = offset;
}
static void class__move_bit_member(struct class *class, const struct cu *cu,
struct class_member *dest,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
struct class_member *from,
const int verbose)
{
struct class_member *from_prev = list_entry(from->tag.node.prev,
struct class_member,
tag.node);
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
const uint8_t is_last_member = (from->tag.node.next ==
&class->type.members);
if (verbose)
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
printf("/* Moving '%s:%u' from after '%s' to "
"after '%s:%u' */\n",
from->name, from->bit_size, from_prev->name,
dest->name, dest->bit_size);
/*
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
* Remove 'from' from the list
*/
list_del(&from->tag.node);
/*
* Add from after dest:
*/
__list_add(&from->tag.node,
&dest->tag.node,
dest->tag.node.next);
/* Check if this was the last entry in the bitfield */
if (from_prev->bit_size == 0) {
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
size_t from_size = class_member__size(from, cu);
/*
* Are we shrinking the struct?
*/
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
if (from_size + from->hole >= cu->addr_size) {
class->type.size -= from_size + from->hole;
class__subtract_offsets_from(class, cu, from_prev,
from_size + from->hole);
} else if (is_last_member)
class->padding += from_size;
else
from_prev->hole += from_size + from->hole;
if (is_last_member) {
/*
* Now we don't have bit_padding anymore
*/
class->bit_padding = 0;
} else
class->nr_bit_holes--;
} else {
/*
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
* Add add the holes after from + its size to the member
* before it:
*/
from_prev->bit_hole += from->bit_hole + from->bit_size;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
from_prev->hole = from->hole;
}
from->bit_hole = dest->bit_hole - from->bit_size;
/*
* Tricky, what are the rules for bitfield layouts on this arch?
* Assume its IA32
*/
from->bit_offset = dest->bit_offset + dest->bit_size;
/*
* Now both have the some offset:
*/
from->offset = dest->offset;
dest->bit_hole = 0;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
from->hole = dest->hole;
dest->hole = 0;
}
static void class__demote_bitfield_members(struct class *class,
struct class_member *from,
struct class_member *to,
const struct base_type *old_type,
const struct base_type *new_type)
{
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
const uint8_t bit_diff = (old_type->size - new_type->size) * 8;
struct class_member *member =
list_prepare_entry(from, &class->type.members, tag.node);
list_for_each_entry_from(member, &class->type.members, tag.node) {
/*
* Assume IA32 bitfield layout
*/
member->bit_offset -= bit_diff;
member->tag.type = new_type->tag.id;
if (member == to)
break;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
member->bit_hole = 0;
}
}
static struct tag *cu__find_base_type_of_size(const struct cu *cu,
const size_t size)
{
const char *type_name;
switch (size) {
case sizeof(unsigned char):
type_name = "unsigned char"; break;
case sizeof(unsigned short int):
type_name = "short unsigned int"; break;
case sizeof(unsigned int):
type_name = "unsigned int"; break;
default:
return NULL;
}
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
return cu__find_base_type_by_name(cu, type_name);
}
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
static int class__demote_bitfields(struct class *class, const struct cu *cu,
const int verbose)
{
struct class_member *member;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
struct class_member *bitfield_head;
const struct tag *old_type_tag, *new_type_tag;
size_t current_bitfield_size, size, bytes_needed, new_size;
int some_was_demoted = 0;
list_for_each_entry(member, &class->type.members, tag.node) {
/*
* Check if we are moving away from a bitfield
*/
if (member->bit_size == 0) {
current_bitfield_size = 0;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
bitfield_head = NULL;
} else {
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
if (bitfield_head == NULL)
bitfield_head = member;
current_bitfield_size += member->bit_size;
}
/*
* Have we got to the end of a bitfield with holes?
*/
if (member->bit_hole == 0)
continue;
size = class_member__size(member, cu);
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
bytes_needed = (current_bitfield_size + 7) / 8;
if (bytes_needed == size)
continue;
old_type_tag = cu__find_tag_by_id(cu, member->tag.type);
new_type_tag = cu__find_base_type_of_size(cu, bytes_needed);
if (verbose)
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
printf("/* Demoting bitfield ('%s' ... '%s') "
"from '%s' to '%s' */\n",
bitfield_head->name, member->name,
tag__base_type(old_type_tag)->name,
tag__base_type(new_type_tag)->name);
class__demote_bitfield_members(class,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
bitfield_head, member,
tag__base_type(old_type_tag),
tag__base_type(new_type_tag));
new_size = class_member__size(member, cu);
member->hole = size - new_size;
if (member->hole != 0)
++class->nr_holes;
member->bit_hole = new_size * 8 - current_bitfield_size;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
some_was_demoted = 1;
/*
* Have we packed it so that there are no hole now?
*/
if (member->bit_hole == 0)
--class->nr_bit_holes;
}
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
/*
* Now look if we have bit padding, i.e. if the the last member
* is a bitfield and its the sole member in this bitfield, i.e.
* if it wasn't already demoted as part of a bitfield of more than
* one member:
*/
member = list_entry(class->type.members.prev,
struct class_member, tag.node);
if (class->bit_padding != 0 && bitfield_head == member) {
size = class_member__size(member, cu);
bytes_needed = (member->bit_size + 7) / 8;
if (bytes_needed < size) {
old_type_tag =
cu__find_tag_by_id(cu, member->tag.type);
new_type_tag =
cu__find_base_type_of_size(cu, bytes_needed);
if (verbose)
printf("/* Demoting bitfield ('%s') "
"from '%s' to '%s' */\n",
member->name,
tag__base_type(old_type_tag)->name,
tag__base_type(new_type_tag)->name);
class__demote_bitfield_members(class,
member, member,
tag__base_type(old_type_tag),
tag__base_type(new_type_tag));
new_size = class_member__size(member, cu);
member->hole = 0;
/*
* Do we need byte padding?
*/
if (member->offset + new_size < class__size(class)) {
class->padding = (class__size(class) -
(member->offset + new_size));
class->bit_padding = 0;
member->bit_hole = (new_size * 8 -
member->bit_size);
} else {
class->padding = 0;
class->bit_padding = new_size * 8 - member->bit_size;
member->bit_hole = 0;
}
some_was_demoted = 1;
}
}
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
return some_was_demoted;
}
static void class__reorganize_bitfields(struct class *class,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
const struct cu *cu, const int verbose)
{
struct class_member *member, *brother;
restart:
list_for_each_entry(member, &class->type.members, tag.node) {
/* See if we have a hole after this member */
if (member->bit_hole != 0) {
/*
* OK, try to find a member that has a bit hole after
* it and that has a size that fits the current hole:
*/
brother =
class__find_next_bit_hole_of_size(class, member,
member->bit_hole);
if (brother != NULL) {
class__move_bit_member(class, cu,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
member, brother,
verbose);
goto restart;
}
}
}
}
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
static void class__fixup_bitfield_types(const struct class *self,
struct class_member *from,
struct class_member *to_before,
Dwarf_Off type)
{
struct class_member *member =
list_prepare_entry(from, &self->type.members, tag.node);
list_for_each_entry_from(member, &self->type.members, tag.node) {
if (member == to_before)
break;
member->tag.type = type;
}
}
/*
* Think about this pahole output a bit:
*
* [filo examples]$ pahole swiss_cheese cheese
* / * <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 * /
* struct cheese {
* <SNIP>
* int bitfield1:1; / * 64 4 * /
* int bitfield2:1; / * 64 4 * /
*
* / * XXX 14 bits hole, try to pack * /
* / * Bitfield WARNING: DWARF size=4, real size=2 * /
*
* short int d; / * 66 2 * /
* <SNIP>
*
* The compiler (gcc 4.1.1 20070105 (Red Hat 4.1.1-51) in the above example),
* Decided to combine what was declared as an int (4 bytes) bitfield but doesn't
* uses even one byte with the next field, that is a short int (2 bytes),
* without demoting the type of the bitfield to short int (2 bytes), so in terms
* of alignment the real size is 2, not 4, to make things easier for the rest of
* the reorganizing routines we just do the demotion ourselves, fixing up the
* sizes.
*/
static void class__fixup_member_types(const struct class *self,
const struct cu *cu)
{
struct class_member *pos, *bitfield_head = NULL;
list_for_each_entry(pos, &self->type.members, tag.node) {
/*
* Is this bitfield member?
*/
if (pos->bit_size != 0) {
/*
* The first entry in a bitfield?
*/
if (bitfield_head == NULL)
bitfield_head = pos;
continue;
}
/*
* OK, not a bitfield member, but have we just passed
* by a bitfield?
*/
if (bitfield_head != NULL) {
const uint16_t real_size = (pos->offset -
bitfield_head->offset);
const size_t size = class_member__size(bitfield_head,
cu);
if (real_size != size) {
struct tag *new_type_tag =
cu__find_base_type_of_size(cu,
real_size);
if (new_type_tag == NULL) {
fprintf(stderr, "pahole: couldn't find"
" a base_type of %d bytes!\n",
real_size);
continue;
}
class__fixup_bitfield_types(self,
bitfield_head, pos,
new_type_tag->id);
}
}
bitfield_head = NULL;
}
}
static struct class *class__reorganize(const struct class *class,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
const struct cu *cu,
const int verbose)
{
struct class_member *member, *brother, *last_member;
size_t last_member_size;
struct class *clone = class__clone(class);
if (clone == NULL)
return NULL;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
class__fixup_member_types(clone, cu);
while (class__demote_bitfields(clone, cu, verbose))
class__reorganize_bitfields(clone, cu, verbose);
restart:
last_member = list_entry(clone->type.members.prev,
struct class_member, tag.node);
last_member_size = class_member__size(last_member, cu);
list_for_each_entry(member, &clone->type.members, tag.node) {
/* See if we have a hole after this member */
if (member->hole != 0) {
/*
* OK, try to find a member that has a hole after it
* and that has a size that fits the current hole:
*/
brother = class__find_next_hole_of_size(clone, member,
cu,
member->hole);
if (brother != NULL) {
class__move_member(clone, member, brother,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
cu, 0, verbose);
goto restart;
}
/*
* OK, but is there padding? If so the last member
* has a hole, if we are not at the last member and
* it has a size that is smaller than the current hole
* we can move it after the current member, reducing
* the padding or eliminating it altogether.
*/
if (clone->padding > 0 &&
member != last_member &&
last_member_size <= member->hole) {
class__move_member(clone, member, last_member,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
cu, 1, verbose);
goto restart;
}
}
}
return clone;
}
static struct option long_options[] = {
[PAHOLE]: Print cacheline boundaries Cacheline size defaults to 32, sample output changing the default to 64 bytes: pahole --cacheline=64 ../../acme/OUTPUT/qemu/net-2.6/net/ipv4/tcp.o inode /* /pub/scm/linux/kernel/git/acme/net-2.6/include/linux/dcache.h:86 */ struct inode { struct hlist_node i_hash; /* 0 8 */ struct list_head i_list; /* 8 8 */ struct list_head i_sb_list; /* 16 8 */ struct list_head i_dentry; /* 24 8 */ long unsigned int i_ino; /* 32 4 */ atomic_t i_count; /* 36 4 */ umode_t i_mode; /* 40 2 */ /* XXX 2 bytes hole, try to pack */ unsigned int i_nlink; /* 44 4 */ uid_t i_uid; /* 48 4 */ gid_t i_gid; /* 52 4 */ dev_t i_rdev; /* 56 4 */ loff_t i_size; /* 60 8 */ struct timespec i_atime; /* 68 8 */ struct timespec i_mtime; /* 76 8 */ struct timespec i_ctime; /* 84 8 */ unsigned int i_blkbits; /* 92 4 */ long unsigned int i_version; /* 96 4 */ blkcnt_t i_blocks; /* 100 4 */ short unsigned int i_bytes; /* 104 2 */ spinlock_t i_lock; /* 106 0 */ /* XXX 2 bytes hole, try to pack */ struct mutex i_mutex; /* 108 24 */ /* ---------- cacheline 2 boundary ---------- */ struct rw_semaphore i_alloc_sem; /* 132 12 */ struct inode_operations * i_op; /* 144 4 */ const struct file_operations * i_fop; /* 148 4 */ struct super_block * i_sb; /* 152 4 */ struct file_lock * i_flock; /* 156 4 */ struct address_space * i_mapping; /* 160 4 */ struct address_space i_data; /* 164 72 */ struct list_head i_devices; /* 236 8 */ union ; /* 244 4 */ int i_cindex; /* 248 4 */ __u32 i_generation; /* 252 4 */ long unsigned int i_dnotify_mask; /* 256 4 */ /* ---------- cacheline 4 boundary ---------- */ struct dnotify_struct * i_dnotify; /* 260 4 */ struct list_head inotify_watches; /* 264 8 */ struct mutex inotify_mutex; /* 272 24 */ long unsigned int i_state; /* 296 4 */ long unsigned int dirtied_when; /* 300 4 */ unsigned int i_flags; /* 304 4 */ atomic_t i_writecount; /* 308 4 */ void * i_private; /* 312 4 */ }; /* size: 316, sum members: 312, holes: 2, sum holes: 4 */ Has to be improved to show the other cacheline boundaries, that may be buried into a included struct or union. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2006-11-05 18:34:54 +01:00
{ "cacheline_size", required_argument, NULL, 'c' },
{ "class_name_len", no_argument, NULL, 'N' },
{ "help", no_argument, NULL, 'h' },
{ "bit_holes", required_argument, NULL, 'B' },
{ "holes", required_argument, NULL, 'H' },
{ "nr_members", no_argument, NULL, 'n' },
{ "sizes", no_argument, NULL, 's' },
{ "nr_definitions", no_argument, NULL, 't' },
{ "nr_methods", no_argument, NULL, 'm' },
{ "exclude", required_argument, NULL, 'x' },
[PAHOLE]: Implement type expansion What is in a struct... [acme@filo pahole]$ pahole net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct work; /* 0 16 */ struct timer_list timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Oh, but what if we want to unfold all the structs? lo pahole]$ pahole --expand_types /home/acme/git/OUTPUT/qemu/linux-2.6/net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct { atomic_long_t data; /* 0 4 */ struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 4 8 */ work_func_t func; /* 12 4 */ } work; /* 0 16 */ struct timer_list { struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 0 8 */ long unsigned int expires; /* 8 4 */ void (*function)(long unsigned int); /* 12 4 */ long unsigned int data; /* 16 4 */ struct tvec_t_base_s * base; /* 20 4 */ } timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Quick hack, as we already had all the needed infrastructure due to anonymous struct printing inside structs/unions, now for the curious, if you have the kernel-debuginfo package installed in your FC6 machine: [acme@filo pahole]$ pahole --expand_types /usr/lib/debug/lib/modules/2.6.19-1.2895.fc6/kernel/net/ipv6/ipv6.ko.debug tcp6_sock Try struct task_struct too 8-) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-01-29 16:12:23 +01:00
{ "expand_types", no_argument, NULL, 'e' },
{ "cu_exclude", required_argument, NULL, 'X' },
{ "decl_exclude", required_argument, NULL, 'D' },
{ "anon_include", no_argument, NULL, 'a' },
{ "nested_anon_include",no_argument, NULL, 'A' },
{ "packable", no_argument, NULL, 'p' },
{ "reorganize", no_argument, NULL, 'k' },
{ "verbose", no_argument, NULL, 'V' },
{ NULL, 0, NULL, 0, }
};
static void usage(void)
{
fprintf(stderr,
"usage: pahole [options] <file_name> {<class_name>}\n"
" where: \n"
[PAHOLE]: Print cacheline boundaries Cacheline size defaults to 32, sample output changing the default to 64 bytes: pahole --cacheline=64 ../../acme/OUTPUT/qemu/net-2.6/net/ipv4/tcp.o inode /* /pub/scm/linux/kernel/git/acme/net-2.6/include/linux/dcache.h:86 */ struct inode { struct hlist_node i_hash; /* 0 8 */ struct list_head i_list; /* 8 8 */ struct list_head i_sb_list; /* 16 8 */ struct list_head i_dentry; /* 24 8 */ long unsigned int i_ino; /* 32 4 */ atomic_t i_count; /* 36 4 */ umode_t i_mode; /* 40 2 */ /* XXX 2 bytes hole, try to pack */ unsigned int i_nlink; /* 44 4 */ uid_t i_uid; /* 48 4 */ gid_t i_gid; /* 52 4 */ dev_t i_rdev; /* 56 4 */ loff_t i_size; /* 60 8 */ struct timespec i_atime; /* 68 8 */ struct timespec i_mtime; /* 76 8 */ struct timespec i_ctime; /* 84 8 */ unsigned int i_blkbits; /* 92 4 */ long unsigned int i_version; /* 96 4 */ blkcnt_t i_blocks; /* 100 4 */ short unsigned int i_bytes; /* 104 2 */ spinlock_t i_lock; /* 106 0 */ /* XXX 2 bytes hole, try to pack */ struct mutex i_mutex; /* 108 24 */ /* ---------- cacheline 2 boundary ---------- */ struct rw_semaphore i_alloc_sem; /* 132 12 */ struct inode_operations * i_op; /* 144 4 */ const struct file_operations * i_fop; /* 148 4 */ struct super_block * i_sb; /* 152 4 */ struct file_lock * i_flock; /* 156 4 */ struct address_space * i_mapping; /* 160 4 */ struct address_space i_data; /* 164 72 */ struct list_head i_devices; /* 236 8 */ union ; /* 244 4 */ int i_cindex; /* 248 4 */ __u32 i_generation; /* 252 4 */ long unsigned int i_dnotify_mask; /* 256 4 */ /* ---------- cacheline 4 boundary ---------- */ struct dnotify_struct * i_dnotify; /* 260 4 */ struct list_head inotify_watches; /* 264 8 */ struct mutex inotify_mutex; /* 272 24 */ long unsigned int i_state; /* 296 4 */ long unsigned int dirtied_when; /* 300 4 */ unsigned int i_flags; /* 304 4 */ atomic_t i_writecount; /* 308 4 */ void * i_private; /* 312 4 */ }; /* size: 316, sum members: 312, holes: 2, sum holes: 4 */ Has to be improved to show the other cacheline boundaries, that may be buried into a included struct or union. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2006-11-05 18:34:54 +01:00
" -h, --help show usage info\n"
" -B, --bit_holes <nr_holes> show only structs at least "
"<nr_holes> bit holes\n"
" -H, --holes <nr_holes> show only structs at least "
"<nr_holes> holes\n"
" -p, --packable show only structs that has "
"holes that can be packed\n"
" -c, --cacheline_size <size> set cacheline size\n"
[PAHOLE]: Implement type expansion What is in a struct... [acme@filo pahole]$ pahole net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct work; /* 0 16 */ struct timer_list timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Oh, but what if we want to unfold all the structs? lo pahole]$ pahole --expand_types /home/acme/git/OUTPUT/qemu/linux-2.6/net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct { atomic_long_t data; /* 0 4 */ struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 4 8 */ work_func_t func; /* 12 4 */ } work; /* 0 16 */ struct timer_list { struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 0 8 */ long unsigned int expires; /* 8 4 */ void (*function)(long unsigned int); /* 12 4 */ long unsigned int data; /* 16 4 */ struct tvec_t_base_s * base; /* 20 4 */ } timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Quick hack, as we already had all the needed infrastructure due to anonymous struct printing inside structs/unions, now for the curious, if you have the kernel-debuginfo package installed in your FC6 machine: [acme@filo pahole]$ pahole --expand_types /usr/lib/debug/lib/modules/2.6.19-1.2895.fc6/kernel/net/ipv6/ipv6.ko.debug tcp6_sock Try struct task_struct too 8-) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-01-29 16:12:23 +01:00
" -e, --expand_types expand class members\n"
" -n, --nr_members show number of members\n"
" -k, --reorganize reorg struct trying to "
"kill holes\n"
[PAHOLE]: Print cacheline boundaries Cacheline size defaults to 32, sample output changing the default to 64 bytes: pahole --cacheline=64 ../../acme/OUTPUT/qemu/net-2.6/net/ipv4/tcp.o inode /* /pub/scm/linux/kernel/git/acme/net-2.6/include/linux/dcache.h:86 */ struct inode { struct hlist_node i_hash; /* 0 8 */ struct list_head i_list; /* 8 8 */ struct list_head i_sb_list; /* 16 8 */ struct list_head i_dentry; /* 24 8 */ long unsigned int i_ino; /* 32 4 */ atomic_t i_count; /* 36 4 */ umode_t i_mode; /* 40 2 */ /* XXX 2 bytes hole, try to pack */ unsigned int i_nlink; /* 44 4 */ uid_t i_uid; /* 48 4 */ gid_t i_gid; /* 52 4 */ dev_t i_rdev; /* 56 4 */ loff_t i_size; /* 60 8 */ struct timespec i_atime; /* 68 8 */ struct timespec i_mtime; /* 76 8 */ struct timespec i_ctime; /* 84 8 */ unsigned int i_blkbits; /* 92 4 */ long unsigned int i_version; /* 96 4 */ blkcnt_t i_blocks; /* 100 4 */ short unsigned int i_bytes; /* 104 2 */ spinlock_t i_lock; /* 106 0 */ /* XXX 2 bytes hole, try to pack */ struct mutex i_mutex; /* 108 24 */ /* ---------- cacheline 2 boundary ---------- */ struct rw_semaphore i_alloc_sem; /* 132 12 */ struct inode_operations * i_op; /* 144 4 */ const struct file_operations * i_fop; /* 148 4 */ struct super_block * i_sb; /* 152 4 */ struct file_lock * i_flock; /* 156 4 */ struct address_space * i_mapping; /* 160 4 */ struct address_space i_data; /* 164 72 */ struct list_head i_devices; /* 236 8 */ union ; /* 244 4 */ int i_cindex; /* 248 4 */ __u32 i_generation; /* 252 4 */ long unsigned int i_dnotify_mask; /* 256 4 */ /* ---------- cacheline 4 boundary ---------- */ struct dnotify_struct * i_dnotify; /* 260 4 */ struct list_head inotify_watches; /* 264 8 */ struct mutex inotify_mutex; /* 272 24 */ long unsigned int i_state; /* 296 4 */ long unsigned int dirtied_when; /* 300 4 */ unsigned int i_flags; /* 304 4 */ atomic_t i_writecount; /* 308 4 */ void * i_private; /* 312 4 */ }; /* size: 316, sum members: 312, holes: 2, sum holes: 4 */ Has to be improved to show the other cacheline boundaries, that may be buried into a included struct or union. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2006-11-05 18:34:54 +01:00
" -N, --class_name_len show size of classes\n"
" -m, --nr_methods show number of methods\n"
[PAHOLE]: Print cacheline boundaries Cacheline size defaults to 32, sample output changing the default to 64 bytes: pahole --cacheline=64 ../../acme/OUTPUT/qemu/net-2.6/net/ipv4/tcp.o inode /* /pub/scm/linux/kernel/git/acme/net-2.6/include/linux/dcache.h:86 */ struct inode { struct hlist_node i_hash; /* 0 8 */ struct list_head i_list; /* 8 8 */ struct list_head i_sb_list; /* 16 8 */ struct list_head i_dentry; /* 24 8 */ long unsigned int i_ino; /* 32 4 */ atomic_t i_count; /* 36 4 */ umode_t i_mode; /* 40 2 */ /* XXX 2 bytes hole, try to pack */ unsigned int i_nlink; /* 44 4 */ uid_t i_uid; /* 48 4 */ gid_t i_gid; /* 52 4 */ dev_t i_rdev; /* 56 4 */ loff_t i_size; /* 60 8 */ struct timespec i_atime; /* 68 8 */ struct timespec i_mtime; /* 76 8 */ struct timespec i_ctime; /* 84 8 */ unsigned int i_blkbits; /* 92 4 */ long unsigned int i_version; /* 96 4 */ blkcnt_t i_blocks; /* 100 4 */ short unsigned int i_bytes; /* 104 2 */ spinlock_t i_lock; /* 106 0 */ /* XXX 2 bytes hole, try to pack */ struct mutex i_mutex; /* 108 24 */ /* ---------- cacheline 2 boundary ---------- */ struct rw_semaphore i_alloc_sem; /* 132 12 */ struct inode_operations * i_op; /* 144 4 */ const struct file_operations * i_fop; /* 148 4 */ struct super_block * i_sb; /* 152 4 */ struct file_lock * i_flock; /* 156 4 */ struct address_space * i_mapping; /* 160 4 */ struct address_space i_data; /* 164 72 */ struct list_head i_devices; /* 236 8 */ union ; /* 244 4 */ int i_cindex; /* 248 4 */ __u32 i_generation; /* 252 4 */ long unsigned int i_dnotify_mask; /* 256 4 */ /* ---------- cacheline 4 boundary ---------- */ struct dnotify_struct * i_dnotify; /* 260 4 */ struct list_head inotify_watches; /* 264 8 */ struct mutex inotify_mutex; /* 272 24 */ long unsigned int i_state; /* 296 4 */ long unsigned int dirtied_when; /* 300 4 */ unsigned int i_flags; /* 304 4 */ atomic_t i_writecount; /* 308 4 */ void * i_private; /* 312 4 */ }; /* size: 316, sum members: 312, holes: 2, sum holes: 4 */ Has to be improved to show the other cacheline boundaries, that may be buried into a included struct or union. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2006-11-05 18:34:54 +01:00
" -s, --sizes show size of classes\n"
" -t, --nr_definitions show how many times struct "
"was defined\n"
" -D, --decl_exclude <prefix> exclude classes declared in "
"files with prefix\n"
" -x, --exclude <prefix> exclude prefixed classes\n"
" -X, --cu_exclude <prefix> exclude prefixed compilation "
"units\n"
" -a, --anon_include include anonymous classes\n"
" -A, --nested_anon_include include nested (inside "
"other structs)\n"
" anonymous classes\n"
" -V, --verbose be verbose\n");
}
int main(int argc, char *argv[])
{
int option, option_index, reorganize = 0;
struct cus *cus;
char *file_name;
char *class_name = NULL;
size_t cacheline_size = 0;
void (*formatter)(const struct structure *s) = class_formatter;
while ((option = getopt_long(argc, argv, "AaB:c:D:ehH:kmnNpstVx:X:",
long_options, &option_index)) >= 0)
switch (option) {
[PAHOLE]: Print cacheline boundaries Cacheline size defaults to 32, sample output changing the default to 64 bytes: pahole --cacheline=64 ../../acme/OUTPUT/qemu/net-2.6/net/ipv4/tcp.o inode /* /pub/scm/linux/kernel/git/acme/net-2.6/include/linux/dcache.h:86 */ struct inode { struct hlist_node i_hash; /* 0 8 */ struct list_head i_list; /* 8 8 */ struct list_head i_sb_list; /* 16 8 */ struct list_head i_dentry; /* 24 8 */ long unsigned int i_ino; /* 32 4 */ atomic_t i_count; /* 36 4 */ umode_t i_mode; /* 40 2 */ /* XXX 2 bytes hole, try to pack */ unsigned int i_nlink; /* 44 4 */ uid_t i_uid; /* 48 4 */ gid_t i_gid; /* 52 4 */ dev_t i_rdev; /* 56 4 */ loff_t i_size; /* 60 8 */ struct timespec i_atime; /* 68 8 */ struct timespec i_mtime; /* 76 8 */ struct timespec i_ctime; /* 84 8 */ unsigned int i_blkbits; /* 92 4 */ long unsigned int i_version; /* 96 4 */ blkcnt_t i_blocks; /* 100 4 */ short unsigned int i_bytes; /* 104 2 */ spinlock_t i_lock; /* 106 0 */ /* XXX 2 bytes hole, try to pack */ struct mutex i_mutex; /* 108 24 */ /* ---------- cacheline 2 boundary ---------- */ struct rw_semaphore i_alloc_sem; /* 132 12 */ struct inode_operations * i_op; /* 144 4 */ const struct file_operations * i_fop; /* 148 4 */ struct super_block * i_sb; /* 152 4 */ struct file_lock * i_flock; /* 156 4 */ struct address_space * i_mapping; /* 160 4 */ struct address_space i_data; /* 164 72 */ struct list_head i_devices; /* 236 8 */ union ; /* 244 4 */ int i_cindex; /* 248 4 */ __u32 i_generation; /* 252 4 */ long unsigned int i_dnotify_mask; /* 256 4 */ /* ---------- cacheline 4 boundary ---------- */ struct dnotify_struct * i_dnotify; /* 260 4 */ struct list_head inotify_watches; /* 264 8 */ struct mutex inotify_mutex; /* 272 24 */ long unsigned int i_state; /* 296 4 */ long unsigned int dirtied_when; /* 300 4 */ unsigned int i_flags; /* 304 4 */ atomic_t i_writecount; /* 308 4 */ void * i_private; /* 312 4 */ }; /* size: 316, sum members: 312, holes: 2, sum holes: 4 */ Has to be improved to show the other cacheline boundaries, that may be buried into a included struct or union. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
2006-11-05 18:34:54 +01:00
case 'c': cacheline_size = atoi(optarg); break;
case 'H': nr_holes = atoi(optarg); break;
case 'B': nr_bit_holes = atoi(optarg); break;
[PAHOLE]: Implement type expansion What is in a struct... [acme@filo pahole]$ pahole net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct work; /* 0 16 */ struct timer_list timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Oh, but what if we want to unfold all the structs? lo pahole]$ pahole --expand_types /home/acme/git/OUTPUT/qemu/linux-2.6/net/ipv6/tcp_ipv6.o delayed_work /* <2bc9> /home/acme/git/linux-2.6/include/linux/workqueue.h:37 */ struct delayed_work { struct work_struct { atomic_long_t data; /* 0 4 */ struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 4 8 */ work_func_t func; /* 12 4 */ } work; /* 0 16 */ struct timer_list { struct list_head { struct list_head * next; /* 0 4 */ struct list_head * prev; /* 4 4 */ } entry; /* 0 8 */ long unsigned int expires; /* 8 4 */ void (*function)(long unsigned int); /* 12 4 */ long unsigned int data; /* 16 4 */ struct tvec_t_base_s * base; /* 20 4 */ } timer; /* 16 24 */ }; /* size: 40, cachelines: 1 */ /* last cacheline: 40 bytes */ [acme@filo pahole]$ Quick hack, as we already had all the needed infrastructure due to anonymous struct printing inside structs/unions, now for the curious, if you have the kernel-debuginfo package installed in your FC6 machine: [acme@filo pahole]$ pahole --expand_types /usr/lib/debug/lib/modules/2.6.19-1.2895.fc6/kernel/net/ipv6/ipv6.ko.debug tcp6_sock Try struct task_struct too 8-) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-01-29 16:12:23 +01:00
case 'e': expand_types = 1; break;
case 'k': reorganize = 1; break;
case 's': formatter = size_formatter; break;
case 'n': formatter = nr_members_formatter; break;
case 'N': formatter = class_name_len_formatter; break;
case 'm': formatter = nr_methods_formatter; break;
case 'p': show_packable = 1; break;
case 't': formatter = nr_definitions_formatter; break;
case 'a': class__include_anonymous = 1; break;
case 'A': class__include_nested_anonymous = 1; break;
case 'D': decl_exclude_prefix = optarg;
decl_exclude_prefix_len = strlen(decl_exclude_prefix);
break;
case 'x': class__exclude_prefix = optarg;
class__exclude_prefix_len = strlen(class__exclude_prefix);
break;
case 'X': cu__exclude_prefix = optarg;
cu__exclude_prefix_len = strlen(cu__exclude_prefix);
break;
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
case 'V': global_verbose = 1; break;
case 'h': usage(); return EXIT_SUCCESS;
default: usage(); return EXIT_FAILURE;
}
if (optind < argc) {
switch (argc - optind) {
case 1: file_name = argv[optind++];
if (reorganize) {
usage();
return EXIT_FAILURE;
}
break;
case 2: file_name = argv[optind++];
class_name = argv[optind++]; break;
default: usage(); return EXIT_FAILURE;
}
} else {
usage();
return EXIT_FAILURE;
}
dwarves__init(cacheline_size);
cus = cus__new(NULL, NULL);
if (cus == NULL) {
fputs("pahole: insufficient memory\n", stderr);
return EXIT_FAILURE;
}
if (cus__load(cus, file_name) != 0) {
fprintf(stderr, "pahole: couldn't load DWARF info from %s\n",
file_name);
return EXIT_FAILURE;
}
cus__for_each_cu(cus, cu_unique_iterator, NULL, cu__filter);
if (formatter == nr_methods_formatter)
cus__for_each_cu(cus, cu_nr_methods_iterator, NULL, cu__filter);
if (class_name != NULL) {
struct structure *s = structures__find(class_name);
if (s == NULL) {
printf("struct %s not found!\n", class_name);
return EXIT_FAILURE;
}
if (reorganize) {
size_t savings;
struct class *clone = class__reorganize(s->class,
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
s->cu,
global_verbose);
if (clone == NULL) {
printf("pahole: out of memory!\n");
return EXIT_FAILURE;
}
savings = class__size(s->class) - class__size(clone);
[PAHOLE]: Reorganize bitfields This cset also does a fixup for cases where the compiler keeps the type specified by the programmer for a bitfield but uses less space to combine with the next, non-bitfield member, these cases can be caught using plain pahole and will appear with this comment: /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ The fixup is done prior to reorganizing the fields. Now an example of this code in action: [acme@filo examples]$ cat swiss_cheese.c <SNIP> struct cheese { char id; short number; char name[52]; int a:1; int b; int bitfield1:1; int bitfield2:1; short d; short e; short last:5; }; <SNIP> [acme@filo examples]$ Lets look at the layout: [acme@filo examples]$ pahole swiss_cheese cheese /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ /* XXX 1 byte hole, try to pack */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int a:1; /* 56 4 */ /* XXX 31 bits hole, try to pack */ int b; /* 60 4 */ /* --- cacheline 1 boundary (64 bytes) --- */ int bitfield1:1; /* 64 4 */ int bitfield2:1; /* 64 4 */ /* XXX 14 bits hole, try to pack */ /* Bitfield WARNING: DWARF size=4, real size=2 */ short int d; /* 66 2 */ short int e; /* 68 2 */ short int last:5; /* 70 2 */ }; /* size: 72, cachelines: 2 */ /* sum members: 71, holes: 1, sum holes: 1 */ /* bit holes: 2, sum bit holes: 45 bits */ /* bit_padding: 11 bits */ /* last cacheline: 8 bytes */ [acme@filo examples]$ Full of holes, has bit padding and uses more than one 64 bytes cacheline. Now lets ask pahole to reorganize it: [acme@filo examples]$ pahole --reorganize --verbose swiss_cheese cheese /* Demoting bitfield ('a' ... 'a') from 'int' to 'unsigned char' */ /* Demoting bitfield ('bitfield1' ... 'bitfield2') from 'short unsigned int' to 'unsigned char' */ /* Demoting bitfield ('last') from 'short int' to 'unsigned char' */ /* Moving 'bitfield2:1' from after 'bitfield1' to after 'a:1' */ /* Moving 'bitfield1:1' from after 'b' to after 'bitfield2:1' */ /* Moving 'last:5' from after 'e' to after 'bitfield1:1' */ /* Moving bitfield('a' ... 'last') from after 'name' to after 'id' */ /* Moving 'e' from after 'd' to after 'b' */ /* <11b> /home/acme/git/pahole/examples/swiss_cheese.c:3 */ struct cheese { char id; /* 0 1 */ unsigned char a:1; /* 1 1 */ unsigned char bitfield2:1; /* 1 1 */ unsigned char bitfield1:1; /* 1 1 */ unsigned char last:5; /* 1 1 */ short int number; /* 2 2 */ char name[52]; /* 4 52 */ int b; /* 56 4 */ short int e; /* 60 2 */ short int d; /* 62 2 */ /* --- cacheline 1 boundary (64 bytes) --- */ }; /* size: 64, cachelines: 1 */ /* saved 8 bytes and 1 cacheline! */ [acme@filo examples]$ Instant karma, it gets completely packed, and look ma, no __attribute__((packed)) :-) With this struct task_struct in the linux kernel is shrunk by 12 bytes, there is more 4 bytes to save with another technique that involves not combining holes, but using the last single hole to fill it with members at the tail of the struct. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2007-02-01 13:51:16 +01:00
if (savings != 0 && global_verbose)
putchar('\n');
tag__print(class__tag(clone), s->cu,
NULL, NULL, 0);
if (savings != 0) {
const size_t cacheline_savings =
(tag__nr_cachelines(class__tag(s->class),
s->cu) -
tag__nr_cachelines(class__tag(clone),
s->cu));
printf(" /* saved %u byte%s", savings,
savings != 1 ? "s" : "");
if (cacheline_savings != 0)
printf(" and %zu cacheline%s",
cacheline_savings,
cacheline_savings != 1 ?
"s" : "");
puts("! */");
}
} else
tag__print(class__tag(s->class), s->cu,
NULL, NULL, 0);
} else
print_classes(formatter);
return EXIT_SUCCESS;
}