Skip to content

GitLab

Verified Commit 01b9f463 authored by Camil Staps's avatar Camil Staps
Browse files

Callgraph profiling support for graph_copy: ignore extra field in thunks when... 

Callgraph profiling support for graph_copy: ignore extra field in thunks when serializing; add extra field when deserializing
parent d139bac2
Hide whitespace changes
Inline Side-by-side
Libraries/graph_copy/Makefile
View file @ 01b9f463
all: copy_graph_to_string.o copy_graph_to_string_interface.o copy_string_to_graph.o copy_string_to_graph_interface.o
copy_graph_to_string.o: copy_graph_to_string.c
copy_graph_to_string.o: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
gcc -O -S -fomit-frame-pointer copy_graph_to_string.c -o copy_graph_to_string.a
sed -f s.sed copy_graph_to_string.a > copy_graph_to_string.s
as copy_graph_to_string.s -o copy_graph_to_string.o
......@@ -11,7 +11,7 @@ copy_graph_to_string_interface.o: copy_graph_to_string_interface.s
as copy_graph_to_string_interface.s -o copy_graph_to_string_interface.o
cp copy_graph_to_string_interface.o "Clean System Files"/copy_graph_to_string_interface.o
copy_string_to_graph.o: copy_string_to_graph.c
copy_string_to_graph.o: copy_string_to_graph.c copy_string_to_graph_implementation.c
gcc -O -S -fomit-frame-pointer copy_string_to_graph.c -o copy_string_to_graph.a
sed -f s.sed copy_string_to_graph.a > copy_string_to_graph.s
as copy_string_to_graph.s -o copy_string_to_graph.o
......
Libraries/graph_copy/Makefile.linux
View file @ 01b9f463
all: copy_graph_to_string.o copy_graph_to_string_interface.o copy_string_to_graph.o copy_string_to_graph_interface.o
copy_graph_to_string.o: copy_graph_to_string.c
copy_graph_to_string.o: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
gcc -O -S -fomit-frame-pointer -DLINUX32 copy_graph_to_string.c -o copy_graph_to_string.a
sed -f s.sed copy_graph_to_string.a > copy_graph_to_string.s
as copy_graph_to_string.s -o copy_graph_to_string.o
......@@ -11,7 +11,7 @@ copy_graph_to_string_interface.o: copy_graph_to_string_interface_linux.s
as copy_graph_to_string_interface_linux.s -o copy_graph_to_string_interface.o
cp copy_graph_to_string_interface.o "Clean System Files"/copy_graph_to_string_interface.o
copy_string_to_graph.o: copy_string_to_graph.c
copy_string_to_graph.o: copy_string_to_graph.c copy_string_to_graph_implementation.c
gcc -O -S -fomit-frame-pointer -DLINUX32 copy_string_to_graph.c -o copy_string_to_graph.a
sed -f s.sed copy_string_to_graph.a > copy_string_to_graph.s
as copy_string_to_graph.s -o copy_string_to_graph.o
......
Libraries/graph_copy/Makefile.linux64
View file @ 01b9f463
all: copy_graph_to_string.o copy_graph_to_string_interface.o copy_string_to_graph.o copy_string_to_graph_interface.o
copy_graph_to_string.o: copy_graph_to_string.c
copy_graph_to_string.o: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
gcc -S -O -DLINUX64 copy_graph_to_string.c -o copy_graph_to_string.a
sed -f s2.sed copy_graph_to_string.a > copy_graph_to_string.s
as copy_graph_to_string.s -o copy_graph_to_string.o
......@@ -11,7 +11,7 @@ copy_graph_to_string_interface.o: copy_graph_to_string_interface_linux64.s
as copy_graph_to_string_interface_linux64.s -o copy_graph_to_string_interface.o
cp copy_graph_to_string_interface.o "Clean System Files"/copy_graph_to_string_interface.o
copy_string_to_graph.o: copy_string_to_graph.c
copy_string_to_graph.o: copy_string_to_graph.c copy_string_to_graph_implementation.c
gcc -S -O -DLINUX64 copy_string_to_graph.c -o copy_string_to_graph.a
sed -f s2.sed copy_string_to_graph.a > copy_string_to_graph.s
as copy_string_to_graph.s -o copy_string_to_graph.o
......
Libraries/graph_copy/Makefile.linux64t
View file @ 01b9f463
all: copy_graph_to_string.o copy_graph_to_string_interface.o copy_string_to_graph.o copy_string_to_graph_interface.o
copy_graph_to_string.o: copy_graph_to_string.c
copy_graph_to_string.o: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
gcc -S -O -DLINUX64 -DTHREAD copy_graph_to_string.c -o copy_graph_to_string.a
sed -f s2.sed copy_graph_to_string.a > copy_graph_to_string.s
as copy_graph_to_string.s -o copy_graph_to_string.o
......@@ -11,7 +11,7 @@ copy_graph_to_string_interface.o: copy_graph_to_string_interface_linux64.s
as copy_graph_to_string_interface_linux64.s --defsym THREAD=1 -o copy_graph_to_string_interface.o
cp copy_graph_to_string_interface.o "Clean System Files"/copy_graph_to_string_interface.o
copy_string_to_graph.o: copy_string_to_graph.c
copy_string_to_graph.o: copy_string_to_graph.c copy_string_to_graph_implementation.c
gcc -S -O -DLINUX64 -DTHREAD copy_string_to_graph.c -o copy_string_to_graph.a
sed -f s2.sed copy_string_to_graph.a > copy_string_to_graph.s
as copy_string_to_graph.s -o copy_string_to_graph.o
......
Libraries/graph_copy/Makefile.linux_arm
View file @ 01b9f463
all: copy_graph_to_string.o copy_string_to_graph.o copy_graph_to_string_interface.o copy_string_to_graph_interface.o
copy_graph_to_string.o: copy_graph_to_string.c
copy_graph_to_string.o: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
gcc -fomit-frame-pointer -O -c -DLINUX32 copy_graph_to_string.c
cp copy_graph_to_string.o "Clean System Files"/copy_graph_to_string.o
......@@ -9,7 +9,7 @@ copy_string_to_graph.o: copy_string_to_graph.c
gcc -fomit-frame-pointer -O -c -DLINUX32 copy_string_to_graph.c
cp copy_string_to_graph.o "Clean System Files"/copy_string_to_graph.o
copy_graph_to_string_interface.o: copy_graph_to_string_interface_linux_arm.s
copy_string_to_graph.o: copy_string_to_graph.c copy_string_to_graph_implementation.c
as copy_graph_to_string_interface_linux_arm.s -o copy_graph_to_string_interface.o
cp copy_graph_to_string_interface.o "Clean System Files"/copy_graph_to_string_interface.o
......
Libraries/graph_copy/Makefile.macosx
View file @ 01b9f463
all: copy_graph_to_string.o copy_graph_to_string_interface.o copy_string_to_graph.o copy_string_to_graph_interface.o
copy_graph_to_string.o: copy_graph_to_string.c
copy_graph_to_string.o: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
gcc -S -O -DMACH_O64 copy_graph_to_string.c -o copy_graph_to_string.a
sed -f s2.sed copy_graph_to_string.a > copy_graph_to_string.s
as copy_graph_to_string.s -o copy_graph_to_string.o
......@@ -11,7 +11,7 @@ copy_graph_to_string_interface.o: copy_graph_to_string_interface_macho.s
as copy_graph_to_string_interface_macho.s -o copy_graph_to_string_interface.o
cp copy_graph_to_string_interface.o "Clean System Files"/copy_graph_to_string_interface.o
copy_string_to_graph.o: copy_string_to_graph.c
copy_string_to_graph.o: copy_string_to_graph.c copy_string_to_graph_implementation.c
gcc -S -O -DMACH_O64 copy_string_to_graph.c -o copy_string_to_graph.a
sed -f s2.sed copy_string_to_graph.a > copy_string_to_graph.s
as copy_string_to_graph.s -o copy_string_to_graph.o
......
Libraries/graph_copy/Makefile64
View file @ 01b9f463
all: copy_graph_to_string.obj copy_graph_to_string_interface.obj copy_string_to_graph.obj copy_string_to_graph_interface.obj
copy_graph_to_string.obj: copy_graph_to_string.c
copy_graph_to_string.obj: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
cl /nologo /c /O2 /Gy copy_graph_to_string.c
copy copy_graph_to_string.obj "Clean System Files"\copy_graph_to_string.obj
......@@ -9,7 +9,7 @@ copy_graph_to_string_interface.obj: copy_graph_to_string_interface.asm
ml64 /nologo /c /DTHREAD=0 copy_graph_to_string_interface.asm
copy copy_graph_to_string_interface.obj "Clean System Files"\copy_graph_to_string_interface.obj
copy_string_to_graph.obj: copy_string_to_graph.c
copy_string_to_graph.obj: copy_string_to_graph.c copy_string_to_graph_implementation.c
cl /nologo /c /O2 /Gy copy_string_to_graph.c
copy copy_string_to_graph.obj "Clean System Files"\copy_string_to_graph.obj
......
Libraries/graph_copy/Makefile64t
View file @ 01b9f463
all: copy_graph_to_string_thread.obj copy_graph_to_string_interface_thread.obj copy_string_to_graph_thread.obj copy_string_to_graph_interface.obj
copy_graph_to_string_thread.obj: copy_graph_to_string.c
copy_graph_to_string.obj: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
cl /nologo /c /O2 /Gy /DTHREAD /Focopy_graph_to_string_thread.obj copy_graph_to_string.c
copy copy_graph_to_string_thread.obj "Clean System Files"\copy_graph_to_string.obj
......@@ -9,7 +9,7 @@ copy_graph_to_string_interface_thread.obj: copy_graph_to_string_interface.asm co
ml64 /nologo /c /DTHREAD=1 /Focopy_graph_to_string_interface_thread.obj copy_graph_to_string_interface.asm
copy copy_graph_to_string_interface_thread.obj "Clean System Files"\copy_graph_to_string_interface.obj
copy_string_to_graph_thread.obj: copy_string_to_graph.c
copy_string_to_graph.obj: copy_string_to_graph.c copy_string_to_graph_implementation.c
cl /nologo /c /O2 /Gy /DTHREAD /Focopy_string_to_graph_thread.obj copy_string_to_graph.c
copy copy_string_to_graph_thread.obj "Clean System Files"\copy_string_to_graph.obj
......
Libraries/graph_copy/Makefilet
View file @ 01b9f463
all: copy_graph_to_string.o copy_graph_to_string_interface.o copy_graph_to_string_interface_ts.o copy_string_to_graph.o copy_string_to_graph_interface.o copy_string_to_graph_interface_ts.o
copy_graph_to_string.o: copy_graph_to_string.c
copy_graph_to_string.o: copy_graph_to_string.c copy_graph_to_string_implementation.c remove_forwarding_pointers_from_graph_implementation.c
gcc -DTHREAD -O -S -fomit-frame-pointer copy_graph_to_string.c -o copy_graph_to_string.a
sed -f s.sed copy_graph_to_string.a > copy_graph_to_string.s
as copy_graph_to_string.s -o copy_graph_to_string.o
......@@ -11,7 +11,7 @@ copy_graph_to_string_interface_ts.o: copy_graph_to_string_interface_ts.s
as copy_graph_to_string_interface_ts.s -o copy_graph_to_string_interface_ts.o
cp copy_graph_to_string_interface_ts.o "Clean System Files"/copy_graph_to_string_interface.o
copy_string_to_graph.o: copy_string_to_graph.c
copy_string_to_graph.o: copy_string_to_graph.c copy_string_to_graph_implementation.c
gcc -DTHREAD -O -S -fomit-frame-pointer copy_string_to_graph.c -o copy_string_to_graph.a
sed -f s.sed copy_string_to_graph.a > copy_string_to_graph.s
as copy_string_to_graph.s -o copy_string_to_graph.o
......
Libraries/graph_copy/copy_graph_to_string.c
View file @ 01b9f463
......@@ -34,6 +34,10 @@ int is_using_desc_relative_to_array (void)
extern void *INT,*CHAR,*BOOL,*REAL,*__STRING__,*__ARRAY__;
/* 2 for callgraph profiling. When this is turned on, we need to ignore the
* last part of thunks, as it is used for the saved cost centre stack. */
extern int profile_type;
/*inline*/
static void copy (Int *dest_p,Int *source_p,Int n_words)
{
......@@ -49,667 +53,22 @@ Int *copy_graph_to_string (Int *node_p,void *begin_free_heap,void *end_free_heap
#endif
)
{
Int **stack_p,**stack_begin,**stack_end,*heap_p;
stack_end=end_free_heap;
stack_begin=end_free_heap;
stack_p=end_free_heap;
heap_p=begin_free_heap;
if (heap_p+2>(Int*)stack_begin)
return NULL;
heap_p[0]=(Int)&__STRING__+2;
heap_p[1]=0;
heap_p+=2;
for (;;){
for (;;){
Int desc;
#ifdef THREAD
if (((unsigned Int)node_p-(unsigned Int)begin_heap)>=heap_size){
if (heap_p>=(Int*)stack_begin)
return NULL;
# ifdef USE_DESC_RELATIVE_TO_ARRAY
heap_p[0]=3+(Int)node_p-(Int)&__ARRAY__;
# else
heap_p[0]=3+(Int)node_p;
# endif
++heap_p;
break;
}
#endif
desc=*node_p;
if (heap_p>=(Int*)stack_begin)
return NULL;
if (!(desc & 1)){
*node_p=1+(Int)heap_p;
#ifdef USE_DESC_RELATIVE_TO_ARRAY
*heap_p++=desc-(Int)&__ARRAY__;
#else
*heap_p++=desc;
#endif
if (desc & 2){
unsigned Int arity;
arity=((unsigned short *)desc)[-1];
if (arity==0){
if (desc==(Int)&INT+2 || desc==(Int)&CHAR+2 || desc==(Int)&BOOL+2
#if ARCH_64
|| desc==(Int)&REAL+2
#endif
){
if (heap_p>=(Int*)stack_begin)
return NULL;
*heap_p++=node_p[1];
break;
#if ! ARCH_64
} else if (desc==(Int)&REAL+2){
if (heap_p+2>(Int*)stack_begin)
return NULL;
heap_p[0]=node_p[1];
heap_p[1]=node_p[2];
heap_p+=2;
break;
#endif
} else if (desc==(Int)&__STRING__+2){
unsigned Int length,n_words;
length=node_p[1];
node_p+=2;
#if ARCH_64
n_words=(length+7)>>3;
#else
n_words=(length+3)>>2;
#endif
if (heap_p+n_words>=(Int*)stack_begin)
return NULL;
*heap_p++=length;
copy (heap_p,node_p,n_words);
heap_p+=n_words;
break;
} else if (desc==(Int)&__ARRAY__+2){
Int array_size,elem_desc;
if (heap_p+2>(Int*)stack_begin){
*node_p=desc;
return NULL;
}
array_size=node_p[1];
elem_desc=node_p[2];
node_p+=3;
heap_p[0]=array_size;
#if defined (USE_DESC_RELATIVE_TO_ARRAY)
heap_p[1]=elem_desc==0 ? elem_desc : elem_desc-(Int)&__ARRAY__;
#else
heap_p[1]=elem_desc;
#endif
heap_p+=2;
if (elem_desc==0){
stack_p-=array_size;
if (stack_p<stack_begin){
if ((Int*)stack_p<heap_p){
node_p[-3]=desc;
return NULL;
}
stack_begin=stack_p;
}
while (--array_size>=0)
stack_p[array_size]=(Int*)node_p[array_size];
break;
} else if (elem_desc==(Int)&INT+2
#if ARCH_64
|| elem_desc==(Int)&REAL+2
#endif
){
if (heap_p+array_size>(Int*)stack_begin)
return NULL;
copy (heap_p,node_p,array_size);
heap_p+=array_size;
break;
#if ! ARCH_64
} else if (elem_desc==(Int)&REAL+2){
array_size<<=1;
if (heap_p+array_size>(Int*)stack_begin)
return NULL;
copy (heap_p,node_p,array_size);
heap_p+=array_size;
break;
#endif
} else if (elem_desc==(Int)&BOOL+2){
#if ARCH_64
array_size=(array_size+7)>>3;
#else
array_size=(array_size+3)>>2;
#endif
if (heap_p+array_size>(Int*)stack_begin)
return NULL;
copy (heap_p,node_p,array_size);
heap_p+=array_size;
break;
} else {
Int n_field_pointers,field_size;
n_field_pointers=*(unsigned short *)elem_desc;
field_size=((unsigned short *)elem_desc)[-1]-(Int)256;
if (n_field_pointers==0){
array_size*=field_size;
if (heap_p+array_size>(Int*)stack_begin){
node_p[-3]=desc;
return NULL;
}
copy (heap_p,node_p,array_size);
heap_p+=array_size;
break;
} else if (n_field_pointers==field_size){
array_size*=field_size;
stack_p-=array_size;
if (stack_p<stack_begin){
if ((Int*)stack_p<heap_p){
node_p[-3]=desc;
return NULL;
}
stack_begin=stack_p;
}
while (--array_size>=0)
stack_p[array_size]=(Int*)node_p[array_size];
break;
} else {
Int n_non_field_pointers,n_array_pointers,n_array_non_pointers,i,*pointer_p;
n_non_field_pointers=field_size-n_field_pointers;
n_array_pointers=n_field_pointers*array_size;
n_array_non_pointers=n_non_field_pointers*array_size;
if (heap_p+n_array_non_pointers>(Int*)stack_begin){
node_p[-3]=desc;
return NULL;
}
stack_p-=n_array_pointers;
if (stack_p<stack_begin){
if ((Int*)stack_p<heap_p+n_array_non_pointers){
node_p[-3]=desc;
return NULL;
}
stack_begin=stack_p;
}
pointer_p=(Int*)stack_p;
for (i=0; i<array_size; ++i){
copy (pointer_p,node_p,n_field_pointers);
pointer_p+=n_field_pointers;
node_p+=n_field_pointers;
copy (heap_p,node_p,n_non_field_pointers);
heap_p+=n_non_field_pointers;
node_p+=n_non_field_pointers;
}
break;
}
}
} else {
break;
}
} else if (arity==1){
node_p=(Int*)node_p[1];
continue;
} else if (arity==2){
if (stack_p<=stack_begin){
if ((Int*)stack_p<=heap_p){
*node_p=desc;
return NULL;
}
--stack_begin;
}
*--stack_p=(Int*)node_p[2];
node_p=(Int*)node_p[1];
continue;
} else if (arity<256){
Int **args,n_words;
args=(Int**)node_p[2];
n_words=arity-1;
stack_p-=n_words;
if (stack_p<stack_begin){
if ((Int*)stack_p<heap_p){
*node_p=desc;
return NULL;
}
stack_begin=stack_p;
}
--n_words;
stack_p[n_words]=args[n_words];
--n_words;
stack_p[n_words]=args[n_words];
while (--n_words>=0)
stack_p[n_words]=args[n_words];
node_p=(Int*)node_p[1];
continue;
} else {
Int n_pointers;
n_pointers=*(unsigned short*)desc;
arity-=256;
if (arity==1){
if (n_pointers==0){
if (heap_p>=(Int*)stack_begin)
return NULL;
*heap_p++=node_p[1];
break;
} else {
node_p=(Int*)node_p[1];
continue;
}
} else if (arity==2){
if (n_pointers==0){
if (heap_p+2>(Int*)stack_begin)
return NULL;
heap_p[0]=node_p[1];
heap_p[1]=node_p[2];
heap_p+=2;
break;
} else {
if (n_pointers==1){
if (heap_p>=(Int*)stack_begin)
return NULL;
*heap_p++=node_p[2];
} else {
if (stack_p<=stack_begin){
if ((Int*)stack_p<=heap_p){
*node_p=desc;
return NULL;
}
--stack_begin;
}
*--stack_p=(Int*)node_p[2];
}
node_p=(Int*)node_p[1];
continue;
}
} else {
Int *args;
args=(Int*)node_p[2];
if (n_pointers==0){
if (heap_p+arity>=(Int*)stack_begin)
return NULL;
heap_p[0]=node_p[1];
++heap_p;
--arity;
copy (heap_p,args,arity);
heap_p+=arity;
break;
} else {
Int n_non_pointers;
n_non_pointers=arity-n_pointers;
if (n_non_pointers>0){
Int *non_pointers_p;
if (heap_p+n_non_pointers>(Int*)stack_begin)
return NULL;
non_pointers_p=&args[n_pointers-1];
copy (heap_p,non_pointers_p,n_non_pointers);
heap_p+=n_non_pointers;
}
--n_pointers;
if (n_pointers>0){
stack_p-=n_pointers;
if (stack_p<stack_begin){
if ((Int*)stack_p<heap_p){
*node_p=desc;
return NULL;
}
stack_begin=stack_p;
}
copy ((Int*)stack_p,args,n_pointers);
}
node_p=(Int*)node_p[1];
continue;
}
}
}
} else {
Int arity;
arity=((int*)desc)[-1];
if (arity>1){
if (arity<256){
Int **args,n_words;
args=(Int**)&node_p[2];
n_words=arity-1;
stack_p-=n_words;
if (stack_p<stack_begin){
if ((Int*)stack_p<heap_p){
*node_p=desc;
return NULL;
}
stack_begin=stack_p;
}
--n_words;
stack_p[n_words]=args[n_words];
while (--n_words>=0)
stack_p[n_words]=args[n_words];
node_p=(Int*)node_p[1];
continue;
} else {
Int n_pointers,n_non_pointers,*non_pointers_p;
n_non_pointers=arity>>8;
n_pointers=(arity & 255) - n_non_pointers;
if (heap_p+n_non_pointers>(Int*)stack_begin)
return NULL;
non_pointers_p=&node_p[1+n_pointers];
copy (heap_p,non_pointers_p,n_non_pointers);
heap_p+=n_non_pointers;
if (n_pointers==0)
break;
else {
if (n_pointers>1){
Int **args;
args=(Int**)&node_p[2];
--n_pointers;
stack_p-=n_pointers;
if (stack_p<stack_begin){
if ((Int*)stack_p<heap_p){
*node_p=desc;
return NULL;
}
stack_begin=stack_p;
}
--n_pointers;
stack_p[n_pointers]=args[n_pointers];
while (--n_pointers>=0)
stack_p[n_pointers]=args[n_pointers];
}