From owner-p4-projects@FreeBSD.ORG Mon Sep 2 10:57:07 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5B93A66; Mon, 2 Sep 2013 10:57:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5EBD2A64 for ; Mon, 2 Sep 2013 10:57:06 +0000 (UTC) (envelope-from novazeta@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3FCEE2235 for ; Mon, 2 Sep 2013 10:57:06 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r82Av6Ul037211 for ; Mon, 2 Sep 2013 10:57:06 GMT (envelope-from novazeta@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r82Av6hA037202 for perforce@freebsd.org; Mon, 2 Sep 2013 10:57:06 GMT (envelope-from novazeta@FreeBSD.org) Date: Mon, 2 Sep 2013 10:57:06 GMT Message-Id: <201309021057.r82Av6hA037202@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to novazeta@FreeBSD.org using -f From: Khilan Gudka Subject: PERFORCE change 552801 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2013 10:57:07 -0000 http://p4web.freebsd.org/@@552801?ac=10 Change 552801 by novazeta@novazeta_zenith on 2013/09/02 10:57:04 Build system updates to allow applying SOAAP to any .bc-a or .ll-a file, including after manually linking with a lib using llvm-link. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#15 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#16 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#15 (text+ko) ==== @@ -88,23 +88,6 @@ ${LLVM_LINK} -o ${.TARGET} ${OIRS} ;\ fi -.if ${MK_SOAAP} != "no" -${PROG}.soaap: ${PROG}.${LLVM_IR_TYPE}-a - ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${PROG}.${LLVM_IR_TYPE}-a - -${PROG}.soaap_cg: ${PROG}.${LLVM_IR_TYPE}-a - ${OPT} -load $(SOAAP_BUILD_DIR)/libcep.so -insert-call-edge-profiling -o ${PROG}.pbc ${PROG}.${LLVM_IR_TYPE}-a - ${LLC} -filetype=obj -o ${PROG}.po ${PROG}.pbc - ${CC} -L $(SOAAP_BUILD_DIR) -L $(LLVM_BUILD_DIR)/lib -lcep_rt -lprofile_rt $(LDADD) -o ${.TARGET} ${PROG}.po - -${PROG}.soaap_perf: ${PROG}.${LLVM_IR_TYPE}-a - ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap -soaap-emulate-performance ${SOAAP_FLAGS} -o ${PROG}.pbc ${PROG}.${LLVM_IR_TYPE}-a - ${LLC} -filetype=obj -o ${PROG}.po ${PROG}.pbc - ${CC} $(LDADD) -o ${.TARGET} ${PROG}.po - -CLEANFILES+= ${PROG}.po ${PROG}.pbc ${PROG}.soaap_perf ${PROG}.soaap_cg -.endif - ${PROG}: ${OBJS} .if defined(PROG_CXX) ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#16 (text+ko) ==== @@ -32,7 +32,7 @@ .if defined(%POSIX) .SUFFIXES: .o .c .y .l .a .sh .f .else -.SUFFIXES: .out .a .dot .instrbc .instrll .instro .obc .oll .ln .manifest .o .c .cc .cpp .cxx .C .m .F .f .e .r .tesla .y .l .S .asm .s .cl .p .h .sh +.SUFFIXES: .out .a .dot .bc-a .ll-a .instrbc .instrll .instro .obc .oll .ln .manifest .o .c .cc .cpp .cxx .C .m .F .f .e .r .soaap .soaap_cg .soaap_perf .tesla .y .l .S .asm .s .cl .p .h .sh .endif AR ?= ar @@ -297,6 +297,22 @@ .error Unknown LLVM IR type ${LLVM_IR_TYPE} .endif +.if defined(WITH_SOAAP) +CLEANFILES+= *.${LLVM_IR_TYPE}-a *.po *.pbc *.soaap_cg *.soaap_perf +.${LLVM_IR_TYPE}-a.soaap: + ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${.IMPSRC} + +.${LLVM_IR_TYPE}-a.soaap_cg: + ${OPT} -load $(SOAAP_BUILD_DIR)/libcep.so -insert-call-edge-profiling -o ${.IMPSRC:R}.pbc ${.IMPSRC} + ${LLC} -filetype=obj -o ${.IMPSRC:R}.po ${.IMPSRC:R}.pbc + ${CC} -L $(SOAAP_BUILD_DIR) -L $(LLVM_BUILD_DIR)/lib -lcep_rt -lprofile_rt $(LDADD) -o ${.TARGET} ${.IMPSRC:R}.po + +.${LLVM_IR_TYPE}-a.soaap_perf: + ${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap -soaap-emulate-performance ${SOAAP_FLAGS} -o ${.IMPSRC:R}.pbc ${.IMPSRC} + ${LLC} -filetype=obj -o ${.IMPSRC:R}.po ${.IMPSRC:R}.pbc + ${CC} $(LDADD) -o ${.TARGET} ${.IMPSRC:R}.po +.endif + .manifest.dot: ${TESLA} graph ${.IMPSRC} -o ${.TARGET}