From ff356b02cc68dc1a0e415200cb50009957873f6e Mon Sep 17 00:00:00 2001 From: simin Date: Fri, 15 Feb 2013 19:57:17 +0900 Subject: [PATCH 1/2] add mccmd init function in booting stage --- kernel/init.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/init.c b/kernel/init.c index cd177ae2..cea67803 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -197,6 +197,7 @@ extern void user_main(); #ifdef DCFA_KMOD extern int mc_cmd_client_init(void); +extern void ibmic_cmd_init(void); #endif int main(void) @@ -219,6 +220,7 @@ int main(void) #ifdef DCFA_KMOD mc_cmd_client_init(); + ibmic_cmd_init(); #endif #ifdef DCFA_RUN From 15b72567381ce71eae5f5e7ab23843b2d4a4fbb7 Mon Sep 17 00:00:00 2001 From: simin Date: Fri, 15 Feb 2013 19:58:03 +0900 Subject: [PATCH 2/2] change dcfampi contents for aal->ihk --- executer/user/Makefile | 2 +- kernel/Makefile.build.mpiu | 33 ++++++++++++++++++--------------- kernel/Makefile.mpiu | 17 +++++++++-------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/executer/user/Makefile b/executer/user/Makefile index d74f1d68..06bf0b50 100644 --- a/executer/user/Makefile +++ b/executer/user/Makefile @@ -6,7 +6,7 @@ TARGET=mcexec all: $(TARGET) mcexec: mcexec.c - $(CC) $(CFLAGS) -pthread -o $@ $^ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -pthread -o $@ $^ $(EXTRA_OBJS) clean: $(RM) $(TARGET) *.o diff --git a/kernel/Makefile.build.mpiu b/kernel/Makefile.build.mpiu index b1772db3..fa333ca3 100755 --- a/kernel/Makefile.build.mpiu +++ b/kernel/Makefile.build.mpiu @@ -1,45 +1,48 @@ -AALDIR=$(AALBASE)/$(TARGET) +IHKDIR=$(IHKBASE)/$(TARGETDIR) OBJS = init.o mem.o debug.o mikc.o listeners.o ap.o syscall.o cls.o host.o OBJS += process.o copy.o waitq.o futex.o timer.o DEPSRCS=$(wildcard $(SRC)/*.c) -#CFLAGS += -I$(SRC)/include -mcmodel=kernel -D__KERNEL__ -DDCFA_KMOD -DIOCTL_FUNC_EXTENSION -CFLAGS += -I$(SRC)/include -mcmodel=kernel -D__KERNEL__ -DDCFA_KMOD -DKNC_MAP_MICPA -CFLAGS += -DCONFIG_$(CONFIG_V) +CFLAGS += -I$(SRC)/include -mcmodel=kernel -D__KERNEL__ +CFLAGS += -DDCFA_KMOD -DKNC_MAP_MICPA -DCONFIG_$(CONFIG_V) LDFLAGS += -e arch_start -AALOBJ = aal/aal.o +IHKOBJ = ihk/ihk.o -include $(SRC)/configs/config.$(TARGET) -include $(AALBASE)/Makefile.common +include $(SRC)/config/config.$(TARGET) +include $(IHKBASE)/Makefile.common -SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/aal CC=$(CC) LD=$(LD) CONFIG_V=$(CONFIG_V) +SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) SRC=$(SRC) +SUBCMD_OPTS += CONFIG_V=$(CONFIG_V) + +OBJDUMP ?= objdump +OBJCOPY ?= objcopy ld_kern_cmd_base = $(LD) $(LDFLAGS) -o $@.elf $^ -mkimage_cmd_base = [ -f $(SRC)/scripts/mkimage.$(TARGET) ] && CC=$(CC) LD=$(LD) LDFLAGS="$(LDFLAGS_MKIMAGE)" sh $(SRC)/scripts/mkimage.$(TARGET) '$@.elf' '$@' '$(SRC)' || cp $@.elf $@ +mkimage_cmd_base = [ -f $(SRC)/script/mkimage.$(TARGET) ] && CC=$(CC) LD=$(LD) LDFLAGS="$(LDFLAGS_MKIMAGE)" OBJDUMP=$(OBJDUMP) OBJCOPY=$(OBJCOPY) sh $(SRC)/script/mkimage.$(TARGET) '$@.elf' '$@' '$(SRC)' || cp $@.elf $@ ld_kern_cmd = $(call echo_cmd,LDKERN,$@)$(ld_kern_cmd_base) mkimage_cmd = $(call echo_cmd,MKIMAGE,$@)$(mkimage_cmd_base) all: depend kernel.img -kernel.img: $(OBJS) $(AALOBJ) $(EXTRA_OBJS) +kernel.img: $(OBJS) $(IHKOBJ) $(EXTRA_OBJS) $(ld_kern_cmd) $(mkimage_cmd) clean: $(rm_cmd) $(OBJS) kernel.img kernel.img.elf Makefile.dep - @$(submake) -C $(AALBASE) $(SUBCMD_OPTS) clean + @$(submake) -C $(IHKBASE) $(SUBCMD_OPTS) clean depend: Makefile.dep Makefile.dep: $(call dep_cmd,$(DEPSRCS)) -$(AALOBJ): FORCE - @mkdir -p $(dir $(AALOBJ)) - $(call echo_cmd,BUILD AAL,$(TARGET))$(submake) -C $(AALBASE) $(SUBCMD_OPTS) prepare - $(call echo_cmd,BUILD AAL,$(TARGET))$(submake) -C $(AALBASE) $(SUBCMD_OPTS) +$(IHKOBJ): FORCE + @mkdir -p $(dir $(IHKOBJ)) + $(call echo_cmd,BUILD IHK,$(TARGET))$(submake) -C $(IHKBASE) $(SUBCMD_OPTS) prepare + $(call echo_cmd,BUILD IHK,$(TARGET))$(submake) -C $(IHKBASE) $(SUBCMD_OPTS) %.o: $(SRC)/%.c $(cc_cmd) diff --git a/kernel/Makefile.mpiu b/kernel/Makefile.mpiu index ec51ce2e..3e30dc1f 100755 --- a/kernel/Makefile.mpiu +++ b/kernel/Makefile.mpiu @@ -1,12 +1,12 @@ -#BUILD_TARGET = mee knf -BUILD_TARGET = knf +BUILD_TARGET ?= attached-mic SRC = $(CURDIR) -CONFIG_V ?= KNF -AALBASE ?= $(SRC)/../../aal/manycore +IHKBASE ?= $(SRC)/../../ihk/cokernel O ?= $(KBUILD_OUTPUT) V ?= $(VERBOSE) +CONFIG_V ?= KNF + EXTRA_OBJS ?= KERNEL = kernel.img @@ -15,8 +15,9 @@ KERNELS = $(addsuffix /$(KERNEL),$(addprefix $(O)/,$(BUILD_TARGET))) SUBCMD_OPTS = V='$(V)' $(if $(O),,$(error Specify the compilation target directory)) -$(if $(shell ls $(AALBASE)/Makefile),,\ - $(error AAL is not found in $(AALBASE))) +#$(if $(shell ls $(IHKBASE)/Makefile),,\ +# $(error IHK is not found in $(IHKBASE))) + .PHONY: all clean depend @@ -30,9 +31,9 @@ all: $(KERNELS) rm -f $@ @mkdir -p $(dir $@) @echo 'SRC = $(SRC)' > $@ - @echo 'AALBASE = $(AALBASE)' >> $@ - @echo 'CONFIG_V = $(CONFIG_V)' >> $@ + @echo 'IHKBASE = $(IHKBASE)' >> $@ @echo 'TARGET = $(notdir $(patsubst %/,%,$(dir $@)))' >> $@ + @echo 'TARGETDIR = $$(shell echo $$(TARGET) | sed "s/-/\//")' >> $@ @echo 'CONFIG_V = $(CONFIG_V)' >> $@ @echo 'EXTRA_OBJS = $(EXTRA_OBJS)' >> $@ @cat Makefile.build.mpiu >> $@