From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHCHZ-0000sL-Gp for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHCHS-00085s-JN for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHCHS-00085a-9N for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:26 -0400 From: Stefan Hajnoczi Date: Tue, 12 Aug 2014 14:37:46 +0100 Message-Id: <1407850675-11890-10-git-send-email-stefanha@redhat.com> In-Reply-To: <1407850675-11890-1-git-send-email-stefanha@redhat.com> References: <1407850675-11890-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 09/18] trace: [tcg] Declare TCG tracing helper routines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi From: Llu=C3=ADs Vilanova Generates file "trace/generated-helpers.h" with TCG helper declarations t= o trace events in guest code at execution time ('trace_${event}_exec_proxy'). Signed-off-by: Llu=C3=ADs Vilanova Signed-off-by: Stefan Hajnoczi --- .gitignore | 1 + Makefile | 2 ++ scripts/tracetool/__init__.py | 1 + scripts/tracetool/format/tcg_helper_h.py | 50 ++++++++++++++++++++++++++= ++++++ trace/Makefile.objs | 24 +++++++++++---- 5 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 scripts/tracetool/format/tcg_helper_h.py diff --git a/.gitignore b/.gitignore index 2286d0a..da56d70 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ /trace/generated-tracers.dtrace /trace/generated-events.h /trace/generated-events.c +/trace/generated-helpers.h /trace/generated-ust-provider.h /trace/generated-ust.c /libcacard/trace/generated-tracers.c diff --git a/Makefile b/Makefile index d6b9dc1..84e9ad4 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,8 @@ GENERATED_HEADERS +=3D trace/generated-tracers-dtrace.h endif GENERATED_SOURCES +=3D trace/generated-tracers.c =20 +GENERATED_HEADERS +=3D trace/generated-helpers.h + ifeq ($(findstring ust,$(TRACE_BACKENDS)),ust) GENERATED_HEADERS +=3D trace/generated-ust-provider.h GENERATED_SOURCES +=3D trace/generated-ust.c diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.p= y index de48c80..a51e0f2 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -227,6 +227,7 @@ class Event(object): fmt) =20 QEMU_TRACE =3D "trace_%(name)s" + QEMU_TRACE_TCG =3D QEMU_TRACE + "_tcg" =20 def api(self, fmt=3DNone): if fmt is None: diff --git a/scripts/tracetool/format/tcg_helper_h.py b/scripts/tracetool= /format/tcg_helper_h.py new file mode 100644 index 0000000..a8ba7ba --- /dev/null +++ b/scripts/tracetool/format/tcg_helper_h.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" +Generate trace/generated-helpers.h. +""" + +__author__ =3D "Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " +__license__ =3D "GPL version 2 or (at your option) any later version" + +__maintainer__ =3D "Stefan Hajnoczi" +__email__ =3D "stefanha@linux.vnet.ibm.com" + + +from tracetool import out +from tracetool.transform import * + + +def generate(events, backend): + events =3D [e for e in events + if "disable" not in e.properties] + + out('/* This file is autogenerated by tracetool, do not edit. */', + '', + ) + + for e in events: + if "tcg-exec" not in e.properties: + continue + + # tracetool.generate always transforms types to host + e_args =3D e.original.args + + # TCG helper proxy declaration + fmt =3D "DEF_HELPER_FLAGS_%(argc)d(%(name)s, %(flags)svoid%(type= s)s)" + args =3D e_args.transform(HOST_2_TCG_COMPAT, HOST_2_TCG, + TCG_2_TCG_HELPER_DECL) + types =3D ", ".join(args.types()) + if types !=3D "": + types =3D ", " + types + + flags =3D "TCG_CALL_NO_RWG, " + + out(fmt, + flags=3Dflags, + argc=3Dlen(args), + name=3De.api() + "_proxy", + types=3Dtypes, + ) diff --git a/trace/Makefile.objs b/trace/Makefile.objs index d7a8696..0a2e6cd 100644 --- a/trace/Makefile.objs +++ b/trace/Makefile.objs @@ -49,6 +49,9 @@ util-obj-y +=3D generated-events.o ###################################################################### # Auto-generated tracing routines =20 +################################################## +# Execution level + $(obj)/generated-tracers.h: $(obj)/generated-tracers.h-timestamp @cmp -s $< $@ || cp $< $@ $(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_D= IR)/config-host.mak @@ -57,8 +60,8 @@ $(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace= -events $(BUILD_DIR)/conf --backends=3D$(TRACE_BACKENDS) \ < $< > $@," GEN $(patsubst %-timestamp,%,$@)") =20 -###################################################################### -# Auto-generated tracing routines (non-DTrace) +############################## +# non-DTrace =20 $(obj)/generated-tracers.c: $(obj)/generated-tracers.c-timestamp @cmp -s $< $@ || cp $< $@ @@ -70,9 +73,8 @@ $(obj)/generated-tracers.c-timestamp: $(SRC_PATH)/trace= -events $(BUILD_DIR)/conf =20 $(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-= tracers.h =20 - -###################################################################### -# Auto-generated DTrace code +############################## +# DTrace =20 # Normal practice is to name DTrace probe file with a '.d' extension # but that gets picked up by QEMU's Makefile as an external dependency @@ -94,6 +96,18 @@ $(obj)/generated-tracers-dtrace.o: $(obj)/generated-tr= acers-dtrace.dtrace util-obj-y +=3D generated-tracers-dtrace.o endif =20 +################################################## +# Translation level + +$(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp +$(obj)/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_D= IR)/config-host.mak + $(call quiet-command,$(TRACETOOL) \ + --format=3Dtcg-helper-h \ + --backend=3D$(TRACE_BACKENDS) \ + < $< > $@," GEN $(patsubst %-timestamp,%,$@)") + @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp= ,%,$@) + + ###################################################################### # Backend code =20 --=20 1.9.3