build: add library build support for host platform

This patch provides library build support for host platform architecture.
It enables creating separate libraries for each SOF audio component.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

Makefile.am

@@ -6,16 +6,29 @@ EXTRA_DIST = version.sh
 
 SRC_DIR = $(abs_top_builddir)/src
 
+if BUILD_HOST
+export ARCH_INCDIR = \
+	-I $(SRC_DIR)/arch/$(ARCH)/include
+
+export REEF_INCDIR = \
+	-I $(SRC_DIR)/include
+
+if BUILD_LIB
+export PLATFORM_INCDIR = \
+	-I $(SRC_DIR)/library/include
+endif
+
+else
 export REEF_INCDIR = \
 	-I $(SRC_DIR)/include \
 	-I $(ROOT_DIR)/include
 
 export ARCH_INCDIR = \
 	-I $(SRC_DIR)/arch/$(ARCH)/include \
 	-I $(SRC_DIR)/arch/$(ARCH)/xtos
-
 export PLATFORM_INCDIR = \
 	-I $(SRC_DIR)/platform/$(PLATFORM)/include
+endif
 
 dist-hook:
 	./version.sh $(top_srcdir)

README

@@ -13,6 +13,13 @@ Cherrytrail :-
 
 ./configure --with-arch=xtensa --with-platform=cherrytrail --with-root-dir=$PWD/../xtensa-root/xtensa-byt-elf --host=xtensa-byt-elf
 
+Library for Host Platform :-
+If building library for host platform, run the following configure. Please modify
+the --prefix option to choose the directory for installing the library files and
+headers
+
+./configure --with-arch=host --enable-library=yes --host=x86_64-unknown-linux-gnu --prefix=$pwd/../host-root/
+
 3) make
 
 4) make bin

build-all.sh

@@ -33,6 +33,10 @@ make clean
 make
 make bin
 
+# Build library for host platform architecture
+./configure --with-arch=host --enable-library=yes --host=x86_64-unknown-linux-gnu --prefix=$pwd/../host-root/
+make
+make install
 
 # list all the images
 ls -l src/arch/xtensa/*.ri

configure.ac

@@ -29,10 +29,13 @@ AC_SUBST(ASFLAGS)
 AC_ARG_WITH([root-dir],
         AS_HELP_STRING([--with-root-dir], [Specify location of cross gcc libraries and headers]),
         [], [with_root_dir=no])
-AS_IF([test "x$with_root_dir" = xno],
-	AC_MSG_ERROR([Please specify cross compiler root header directory]),
-	[ROOT_DIR=$with_root_dir])
-AC_SUBST(ROOT_DIR)
+
+# check if we are building FW image or library
+AC_ARG_ENABLE(library, [AS_HELP_STRING([--enable-library],[build library])], have_library=$enableval, have_library=no)
+if test "$have_library" = "yes"; then
+	AC_DEFINE([CONFIG_LIB], [1], [Configure for Shared Library])
+fi
+AM_CONDITIONAL(BUILD_LIB, test "$have_library" = "yes")
 
 # Architecture support
 AC_ARG_WITH([arch],
@@ -57,14 +60,31 @@ case "$with_arch" in
 
 	ARCH="xtensa"
 	AC_SUBST(ARCH)
+
+	AS_IF([test "x$with_root_dir" = xno],
+	AC_MSG_ERROR([Please specify cross compiler root header directory]),
+		[ROOT_DIR=$with_root_dir])
+		AC_SUBST(ROOT_DIR)
+    ;;
+    host*)
+
+	ARCH_CFLAGS="-g"
+	AC_SUBST(ARCH_CFLAGS)
+
+	# extra CFLAGS defined here otherwise configure working gcc tests fails.
+	CFLAGS="${CFLAGS:+$CFLAGS } -O3"
+	LDFLAGS="${LDFLAGS:+$LDFLAGS }-lpthread"
+
+	ARCH="host"
+	AC_SUBST(ARCH)
     ;;
     *)
         AC_MSG_ERROR([DSP architecture not specified])
     ;;
 esac
 
 AM_CONDITIONAL(BUILD_XTENSA, test "$ARCH" = "xtensa")
-
+AM_CONDITIONAL(BUILD_HOST, test "$ARCH" = "host")
 
 # Platform support
 AC_ARG_WITH([platform],
@@ -175,7 +195,12 @@ case "$with_platform" in
 	AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
     ;;
     *)
-        AC_MSG_ERROR([Host platform not specified])
+	if test "$ARCH" = "host"; then
+		PLATFORM="host"
+		AC_SUBST(PLATFORM)
+	else
+		AC_MSG_ERROR([Host platform not specified])
+	fi
     ;;
 esac
 
@@ -215,6 +240,70 @@ AM_CONDITIONAL(BUILD_DMA_TRACE,  test "x$enable_dma_trace" != "xno")
 PLATFORM_BOOT_LDR_LDSCRIPT="boot_ldr.x"
 AC_SUBST(PLATFORM_BOOT_LDR_LDSCRIPT)
 
+# Optimisation settings and checks
+
+# SSE4_2 support
+AC_ARG_ENABLE(sse42, [AS_HELP_STRING([--enable-sse42],[enable SSE42 optimizations])], have_sse42=$enableval, have_sse42=yes)
+AX_CHECK_COMPILE_FLAG(-msse4.2, [SSE42_CFLAGS="-DOPS_SSE42 -msse4.2 -ffast-math -ftree-vectorizer-verbose=0"],
+	[have_sse42=no])
+if test "$have_sse42" = "yes"; then
+	AC_DEFINE(HAVE_SSE42,1,[Define to enable SSE42 optimizations.])
+fi
+AM_CONDITIONAL(HAVE_SSE42, test "$have_sse42" = "yes")
+AC_SUBST(SSE42_CFLAGS)
+
+# AVX support
+AC_ARG_ENABLE(avx, [AS_HELP_STRING([--enable-avx],[enable AVX optimizations])], have_avx=$enableval, have_avx=yes)
+AX_CHECK_COMPILE_FLAG(-mavx, [AVX_CFLAGS="-DOPS_AVX -mavx -ffast-math -ftree-vectorizer-verbose=0"],
+	[have_avx=no])
+if test "$have_avx" = "yes"; then
+	AC_DEFINE(HAVE_AVX,1,[Define to enable AVX optimizations.])
+fi
+AM_CONDITIONAL(HAVE_AVX, test "$have_avx" = "yes")
+AC_SUBST(AVX_CFLAGS)
+
+
+# AVX2 support
+AC_ARG_ENABLE(avx2, [AS_HELP_STRING([--enable-avx2],[enable AVX2 optimizations])], have_avx2=$enableval, have_avx2=yes)
+AX_CHECK_COMPILE_FLAG(-mavx2, [AVX2_CFLAGS="-DOPS_AVX2 -mavx2 -ffast-math -ftree-vectorizer-verbose=0"],
+		[have_avx2=no])
+if test "$have_avx2" = "yes"; then
+	AC_DEFINE(HAVE_AVX2,1,[Define to enable AVX2 optimizations.])
+fi
+AM_CONDITIONAL(HAVE_AVX2, test "$have_avx2" = "yes")
+AC_SUBST(AVX2_CFLAGS)
+
+
+# FMA support
+AC_ARG_ENABLE(fma, [AS_HELP_STRING([--enable-fma],[enable FMA optimizations])], have_fma=$enableval, have_fma=yes)
+AX_CHECK_COMPILE_FLAG(-mfma, [FMA_CFLAGS="-DOPS_FMA -mfma -ffast-math -ftree-vectorizer-verbose=0"],
+	[have_fma=no])
+if test "$have_fma" = "yes"; then
+	AC_DEFINE(HAVE_FMA,1,[Define to enable FMA optimizations.])
+fi
+AM_CONDITIONAL(HAVE_FMA, test "$have_fma" = "yes")
+AC_SUBST(FMA_CFLAGS)
+
+# Hifi2EP
+AC_ARG_ENABLE(hifi2ep, [AS_HELP_STRING([--enable-hifi2ep],[enable HiFi2EP optimizations])], have_hifi2ep=$enableval, have_hifi2ep=yes)
+AX_CHECK_COMPILE_FLAG(-mhifi2ep, [FMA_CFLAGS="-DOPS_HIFI2EP -mhifi2ep -ffast-math -ftree-vectorizer-verbose=0"],
+	[have_hifi2ep=no])
+if test "$have_hifi2ep" = "yes"; then
+	AC_DEFINE(HAVE_HIFI2EP,1,[Define to enable Hifi2 EP optimizations.])
+fi
+AM_CONDITIONAL(HAVE_HIFI2EP, test "$have_hifi2ep" = "yes")
+AC_SUBST(HIFI2EP_CFLAGS)
+
+# Hifi3
+AC_ARG_ENABLE(hifi3, [AS_HELP_STRING([--enable-hifi3],[enable HiFi3 optimizations])], have_hifi3=$enableval, have_hifi3=yes)
+AX_CHECK_COMPILE_FLAG(-mhihi3, [FMA_CFLAGS="-DOPS_HIFI3 -mhifi3 -ffast-math -ftree-vectorizer-verbose=0"],
+	[have_hifi3=no])
+if test "$have_hifi3" = "yes"; then
+	AC_DEFINE(HAVE_HIFI3,1,[Define to enable Hifi3 optimizations.])
+fi
+AM_CONDITIONAL(HAVE_HIFI3, test "$have_hifi3" = "yes")
+AC_SUBST(HIFI3_CFLAGS)
+
 # Test after CFLAGS set othewise test of cross compiler fails. 
 AM_PROG_AS
 AM_PROG_AR
@@ -240,6 +329,9 @@ AC_CONFIG_FILES([
 	src/arch/xtensa/include/xtensa/config/Makefile
 	src/arch/xtensa/hal/Makefile
 	src/arch/xtensa/xtos/Makefile
+	src/arch/host/Makefile
+	src/arch/host/include/Makefile
+	src/arch/host/include/arch/Makefile
 	src/audio/Makefile
         src/math/Makefile
 	src/drivers/Makefile
@@ -251,6 +343,9 @@ AC_CONFIG_FILES([
 	src/include/reef/math/Makefile
 	src/include/uapi/Makefile
 	src/ipc/Makefile
+	src/library/Makefile
+	src/library/include/Makefile
+	src/library/include/platform/Makefile
 	src/lib/Makefile
 	src/platform/Makefile
 	src/platform/baytrail/Makefile

src/Makefile.am

@@ -1 +1,12 @@
+export COMMON_INCDIR = \
+	$(REEF_INCDIR) \
+	$(ARCH_INCDIR) \
+	$(PLATFORM_INCDIR)
+
+if BUILD_LIB
+SUBDIRS = ipc math audio arch include library
+endif
+
+if BUILD_XTENSA
 SUBDIRS = include init math audio platform tasks drivers ipc lib arch
+endif

src/arch/Makefile.am

@@ -1,3 +1,7 @@
 if BUILD_XTENSA
 SUBDIRS = xtensa
 endif
+
+if BUILD_HOST
+SUBDIRS = host
+endif

src/arch/host/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = include

src/arch/host/include/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = arch

src/arch/host/include/arch/Makefile.am

@@ -0,0 +1,9 @@
+includedir = $(prefix)/include/sof/arch
+
+include_HEADERS = \
+	cache.h \
+	interrupt.h \
+	reef.h \
+	spinlock.h \
+	timer.h \
+	wait.h

src/arch/host/include/arch/cache.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017, Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of the Intel Corporation nor the
+ *     names of its contributors may be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+ */
+
+#ifndef __INCLUDE_ARCH_CACHE__
+#define __INCLUDE_ARCH_CACHE__
+
+#include <stdint.h>
+#include <stddef.h>
+
+static inline void dcache_writeback_region(void *addr, size_t size) {}
+static inline void dcache_invalidate_region(void *addr, size_t size) {}
+static inline void icache_invalidate_region(void *addr, size_t size) {}
+static inline void dcache_writeback_invalidate_region(void *addr,
+	size_t size) {}
+
+#endif