]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
new makefile graphitemaster/master
authorDale Weiler <weilercdale@gmail.com>
Fri, 17 Apr 2020 17:28:27 +0000 (13:28 -0400)
committerDale Weiler <weilercdale@gmail.com>
Fri, 17 Apr 2020 17:28:27 +0000 (13:28 -0400)
Makefile
ir.cpp
ir.h
tests/xor-optimized.tmpl [new file with mode: 0644]

index f227d36cd4c08df63b55d245ce0314417929d287..dc49416daa8e60464c2a1812d2fcf42ffb6c15d1 100644 (file)
--- a/Makefile
+++ b/Makefile
-UNAME ?= $(shell uname)
-CYGWIN = $(findstring CYGWIN, $(UNAME))
-MINGW = $(findstring MINGW, $(UNAME))
+# Compilation options:
+# * LTO       - Link time optimization       [default=0]
+# * ASAN      - Address sanitizer            [default=0]
+# * UBSAN     - Undefined behavior sanitizer [default=0]
+# * DEBUG     - Debug build                  [default=0]
+# * UNUSED    - Remove unused references     [default=1]
+# * SRCDIR    - Out of tree builds           [default=./]
+LTO ?= 0
+ASAN ?= 0
+UBSAN ?= 0
+DEBUG ?= 0
+UNUSED ?= 1
+SRCDIR ?= ./
+
+# Determine if we're building for Windows or not so we can set the right file
+# extensions for the binaries and exclude the testsuite because it doesn't build
+# for that platform.
+ifeq ($(OS),Windows_NT)
+       GMQCC := gmqcc.exe
+       QCVM := qcvm.exe
+else
+       GMQCC := gmqcc
+       QCVM := qcvm
+       TESTSUITE := testsuite
+endif
+
+# C++ compiler
+CXX ?= clang++
 
-ifneq ("$(CYGWIN)", "")
-WINDOWS=1
+# Build artifact directories
+OBJDIR := .build/objs
+DEPDIR := .build/deps
+
+# Collect all the source files for GMQCC.
+GSRCS := ast.cpp
+GSRCS += code.cpp
+GSRCS += conout.cpp
+GSRCS += fold.cpp
+GSRCS += ftepp.cpp
+GSRCS += intrin.cpp
+GSRCS += ir.cpp
+GSRCS += lexer.cpp
+GSRCS += main.cpp
+GSRCS += opts.cpp
+GSRCS += parser.cpp
+GSRCS += stat.cpp
+GSRCS += utf8.cpp
+GSRCS += util.cpp
+
+# Collect all the source files for QCVM.
+QSRCS := exec.cpp
+QSRCS += stat.cpp
+QSRCS += util.cpp
+
+# Collect all the source files for TESTSUITE.
+TSRCS := conout.cpp
+TSRCS += opts.cpp
+TSRCS += stat.cpp
+TSRCS += test.cpp
+TSRCS += util.cpp
+
+#
+# Compilation flags
+#
+CXXFLAGS := -Wall
+CXXFLAGS += -Wextra
+CXXFLAGS += -Wno-parentheses
+CXXFLAGS += -Wno-class-memaccess
+CXXFLAGS += -Wno-implicit-fallthrough
+CXXFLAGS += -std=c++11
+
+# Disable some unneeded features.
+CXXFLAGS += -fno-exceptions
+CXXFLAGS += -fno-rtti
+CXXFLAGS += -fno-asynchronous-unwind-tables
+
+# Give each function and data it's own section so the linker can remove unused
+# references to each, producing smaller, tighter binaries.
+ifeq ($(UNUSED),1)
+       CXXFLAGS += -ffunction-sections
+       CXXFLAGS += -fdata-sections
 endif
-ifneq ("$(MINGW)", "")
-WINDOWS=1
+
+# Enable link-time optimizations if requested.
+ifeq ($(LTO),1)
+       CXXFLAGS += -flto
 endif
 
-CXX ?= clang++
-CXXFLAGS = \
-       -std=c++11 \
-       -Wall \
-       -Wextra \
-       -Wno-parentheses \
-       -Wno-class-memaccess \
-       -fno-exceptions \
-       -fno-rtti \
-       -MD \
-       -g3
-
-CSRCS = \
-       ast.cpp \
-       code.cpp \
-       conout.cpp \
-       fold.cpp \
-       ftepp.cpp \
-       intrin.cpp \
-       ir.cpp \
-       lexer.cpp \
-       main.cpp \
-       opts.cpp \
-       parser.cpp \
-       stat.cpp \
-       utf8.cpp \
-       util.cpp
-
-TSRCS = \
-       conout.cpp \
-       opts.cpp \
-       stat.cpp \
-       test.cpp \
-       util.cpp
-
-VSRCS = \
-       exec.cpp \
-       stat.cpp \
-       util.cpp
-
-COBJS = $(CSRCS:.cpp=.o)
-TOBJS = $(TSRCS:.cpp=.o)
-VOBJS = $(VSRCS:.cpp=.o)
-
-CDEPS = $(CSRCS:.cpp=.d)
-TDEPS = $(TSRCS:.cpp=.d)
-VDEPS = $(VSRCS:.cpp=.d)
-
-ifndef WINDOWS
-CBIN = gmqcc
-VBIN = qcvm
-TBIN = testsuite
+ifeq ($(DEBUG),1)
+       # Ensure there is a frame-pointer in debug builds.
+       CXXFLAGS += -fno-omit-frame-pointer
+
+       # Disable all optimizations in debug builds.
+       CXXFLAGS += -O0
+
+       # Enable debug symbols.
+       CXXFLAGS += -g
 else
-CBIN = gmqcc.exe
-VBIN = qcvm.exe
+       # Disable all the stack protection features in release builds.
+       CXXFLAGS += -fno-stack-protector
+       CXXFLAGS += -fno-stack-check
+
+       # Disable frame pointer in release builds when AddressSanitizer isn't present.
+       ifeq ($(ASAN),1)
+               CXXFLAGS += -fno-omit-frame-pointer
+       else
+               CXXFLAGS += -fomit-frame-pointer
+       endif
+
+       # Highest optimization flag in release builds.
+       CXXFLAGS += -O3
+endif
+
+# Sanitizer selection
+ifeq ($(ASAN),1)
+       CXXFLAGS += -fsanitize=address
+endif
+ifeq ($(UBSAN),1)
+       CXXFLAGS += -fsanitize=undefined
 endif
 
-ifndef WINDOWS
-all: $(CBIN) $(QCVM) $(TBIN)
+#
+# Dependency flags
+#
+DEPFLAGS := -MMD
+DEPFLAGS += -MP
+
+#
+# Linker flags
+#
+LDFLAGS :=
+
+# Remove unreferenced sections
+ifeq ($(UNUSED),1)
+       LDFLAGS += -Wl,--gc-sections
+endif
+
+# Enable link-time optimizations if request.
+ifeq ($(LTO),1)
+       LDFLAGS += -flto
+endif
+
+# Sanitizer selection
+ifeq ($(ASAN),1)
+       LDFLAGS += -fsanitize=address
+endif
+ifeq ($(UBSAN),1)
+       LDFLAGS += -fsanitize=undefined
+endif
+
+# Strip the binaries when not a debug build
+ifneq (,$(findstring, -g,$(CXXFLAGS)))
+       STRIP := true
 else
-all: $(CBIN) $(QCVM)
+       STRIP := strip
 endif
 
-$(CBIN): $(COBJS)
-       $(CXX) $(COBJS) -o $@
+all: $(GMQCC) $(QCVM) $(TESTSUITE)
+
+# Build artifact directories.
+$(DEPDIR):
+       @mkdir -p $(DEPDIR)
+$(OBJDIR):
+       @mkdir -p $(OBJDIR)
 
-$(VBIN): $(VOBJS)
-       $(CXX) $(VOBJS) -o $@
+$(OBJDIR)/%.o: %.cpp $(DEPDIR)/%.d | $(OBJDIR) $(DEPDIR)
+       $(CXX) -MT $@ $(DEPFLAGS) -MF $(DEPDIR)/$*.Td $(CXXFLAGS) -c -o $@ $<
+       @mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d
 
-ifndef WINDOWS
-$(TBIN): $(TOBJS)
-       $(CXX) $(TOBJS) -o $@
+$(GMQCC): $(filter %.o,$(GSRCS:%.cpp=$(OBJDIR)/%.o))
+       $(CXX) $^ $(LDFLAGS) -o $@
+       $(STRIP) $@
 
-test: $(CBIN) $(VBIN) $(TBIN)
-       @./$(TBIN)
+$(QCVM): $(filter %.o,$(QSRCS:%.cpp=$(OBJDIR)/%.o))
+       $(CXX) $^ $(LDFLAGS) -o $@
+       $(STRIP) $@
+
+$(TESTSUITE): $(filter %.o,$(TSRCS:%.cpp=$(OBJDIR)/%.o))
+       $(CXX) $^ $(LDFLAGS) -o $@
+       $(STRIP) $@
+
+# Determine if the tests should be run.
+RUNTESTS := true
+ifdef TESTSUITE
+       RUNTESTS := ./$(TESTSUITE)
 endif
 
-.cpp.o:
-       $(CXX) -c $(CXXFLAGS) $< -o $@
+test: $(QCVM) $(TESTSUITE)
+       @$(RUNTESTS)
 
 clean:
-       rm -f *.d
-       rm -f $(COBJS) $(CDEPS) $(CBIN)
-       rm -f $(VOBJS) $(VDEPS) $(VBIN)
-ifndef WINDOWS
-       rm -f $(TOBJS) $(TDEPS) $(TOBJS)
-endif
+       rm -rf $(DEPDIR) $(OBJDIR)
+
+.PHONY: test clean $(DEPDIR) $(OBJDIR)
+
+# Dependencies
+$(filter %.d,$(GSRCS:%.cpp=$(DEPDIR)/%.d)):
+include $(wildcard $@)
+
+$(filter %.d,$(QSRCS:%.cpp=$(DEPDIR)/%.d)):
+include $(wildcard $@)
 
--include *.d
+$(filter %.d,$(TSRCS:%.cpp=$(DEPDIR)/%.d)):
+include $(wildcard $@)
diff --git a/ir.cpp b/ir.cpp
index 8388aab31df51492d1a40bbe665824f220a0c8fe..0f7989f328e2f8501f4158e73751cd28742548b7 100644 (file)
--- a/ir.cpp
+++ b/ir.cpp
@@ -2515,7 +2515,7 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
             stmt.opcode = INSTR_BITOR;
             stmt.o1.s1 = instr->_m_ops[1]->codeAddress();
             stmt.o2.s1 = instr->_m_ops[2]->codeAddress();
-            stmt.o3.s1 = instr->_m_ops[0]->codeAddress();
+            stmt.o3.s1 = func->m_owner->m_vinstr_temp[1]->codeAddress();
             code_push_statement(code, &stmt, instr->m_context);
             stmt.opcode = INSTR_BITAND;
             stmt.o1.s1 = instr->_m_ops[1]->codeAddress();
@@ -2523,7 +2523,7 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
             stmt.o3.s1 = func->m_owner->m_vinstr_temp[0]->codeAddress();
             code_push_statement(code, &stmt, instr->m_context);
             stmt.opcode = INSTR_SUB_F;
-            stmt.o1.s1 = instr->_m_ops[0]->codeAddress();
+            stmt.o1.s1 = func->m_owner->m_vinstr_temp[1]->codeAddress();
             stmt.o2.s1 = func->m_owner->m_vinstr_temp[0]->codeAddress();
             stmt.o3.s1 = instr->_m_ops[0]->codeAddress();
             code_push_statement(code, &stmt, instr->m_context);
@@ -2575,7 +2575,7 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
                 stmt.opcode = INSTR_BITOR;
                 stmt.o1.s1 = instr->_m_ops[1]->codeAddress() + j;
                 stmt.o2.s1 = instr->_m_ops[2]->codeAddress() + j;
-                stmt.o3.s1 = instr->_m_ops[0]->codeAddress() + j;
+                stmt.o3.s1 = func->m_owner->m_vinstr_temp[1]->codeAddress() + j;
                 code_push_statement(code, &stmt, instr->m_context);
                 stmt.opcode = INSTR_BITAND;
                 stmt.o1.s1 = instr->_m_ops[1]->codeAddress() + j;
@@ -2584,7 +2584,7 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
                 code_push_statement(code, &stmt, instr->m_context);
             }
             stmt.opcode = INSTR_SUB_V;
-            stmt.o1.s1 = instr->_m_ops[0]->codeAddress();
+            stmt.o1.s1 = func->m_owner->m_vinstr_temp[1]->codeAddress();
             stmt.o2.s1 = func->m_owner->m_vinstr_temp[0]->codeAddress();
             stmt.o3.s1 = instr->_m_ops[0]->codeAddress();
             code_push_statement(code, &stmt, instr->m_context);
@@ -2632,7 +2632,7 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
                 stmt.opcode = INSTR_BITOR;
                 stmt.o1.s1 = instr->_m_ops[1]->codeAddress() + j;
                 stmt.o2.s1 = instr->_m_ops[2]->codeAddress();
-                stmt.o3.s1 = instr->_m_ops[0]->codeAddress() + j;
+                stmt.o3.s1 = func->m_owner->m_vinstr_temp[1]->codeAddress() + j;
                 code_push_statement(code, &stmt, instr->m_context);
                 stmt.opcode = INSTR_BITAND;
                 stmt.o1.s1 = instr->_m_ops[1]->codeAddress() + j;
@@ -2641,7 +2641,7 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
                 code_push_statement(code, &stmt, instr->m_context);
             }
             stmt.opcode = INSTR_SUB_V;
-            stmt.o1.s1 = instr->_m_ops[0]->codeAddress();
+            stmt.o1.s1 = func->m_owner->m_vinstr_temp[1]->codeAddress();
             stmt.o2.s1 = func->m_owner->m_vinstr_temp[0]->codeAddress();
             stmt.o3.s1 = instr->_m_ops[0]->codeAddress();
             code_push_statement(code, &stmt, instr->m_context);
@@ -2655,7 +2655,7 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
             for (j = 0; j < 3; ++j) {
                 stmt.o1.s1 = instr->_m_ops[1]->codeAddress() + (j + 1) % 3;
                 stmt.o2.s1 = instr->_m_ops[2]->codeAddress() + (j + 2) % 3;
-                stmt.o3.s1 = instr->_m_ops[0]->codeAddress() + j;
+                stmt.o3.s1 = func->m_owner->m_vinstr_temp[1]->codeAddress() + j;
                 code_push_statement(code, &stmt, instr->m_context);
                 stmt.o1.s1 = instr->_m_ops[1]->codeAddress() + (j + 2) % 3;
                 stmt.o2.s1 = instr->_m_ops[2]->codeAddress() + (j + 1) % 3;
@@ -2663,7 +2663,7 @@ static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *bloc
                 code_push_statement(code, &stmt, instr->m_context);
             }
             stmt.opcode = INSTR_SUB_V;
-            stmt.o1.s1 = instr->_m_ops[0]->codeAddress();
+            stmt.o1.s1 = func->m_owner->m_vinstr_temp[1]->codeAddress();
             stmt.o2.s1 = func->m_owner->m_vinstr_temp[0]->codeAddress();
             stmt.o3.s1 = instr->_m_ops[0]->codeAddress();
             code_push_statement(code, &stmt, instr->m_context);
diff --git a/ir.h b/ir.h
index 42f6ce578ea958bd5e4cf409da8561eef2fc91b5..c81d1a24032454972fcfddbb5965992547cb6f4c 100644 (file)
--- a/ir.h
+++ b/ir.h
@@ -249,7 +249,7 @@ ir_block*       ir_function_create_block(lex_ctx_t ctx, ir_function*, const char
 
 /* builder */
 #define IR_HT_SIZE          1024
-#define IR_MAX_VINSTR_TEMPS 1
+#define IR_MAX_VINSTR_TEMPS 2
 
 struct ir_builder {
     ir_builder(const std::string& modulename);
diff --git a/tests/xor-optimized.tmpl b/tests/xor-optimized.tmpl
new file mode 100644 (file)
index 0000000..4ff8365
--- /dev/null
@@ -0,0 +1,21 @@
+I: xor.qc
+D: test bitwise xor
+T: -execute
+C: -std=gmqcc -O3
+E: $null
+M: 6
+M: 8
+M: commutative
+M: assocative
+M: inverse
+M: vv: '6 8 6'
+M: vf: '15 8 15'
+M: vv: '6 8 6'
+M: vf: '15 8 15'
+M: 100:200 swapped is: 200:100
+M: '1 2 3':'4 5 6' swapped is: '4 5 6':'1 2 3'
+M: '4 7 6'
+M: '4 7 6'
+M: '4 7 6'
+M: '4 7 6'
+M: '4 7 6'