tests for kvx

82 files changed, 0 insertions, 1326 deletions

diff --git a/test/mppa/instr/.gitignore b/test/mppa/instr/.gitignore
deleted file mode 100644
index ea1472ec..00000000
--- a/test/mppa/instr/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-output/
diff --git a/test/mppa/instr/Makefile b/test/mppa/instr/Makefile
deleted file mode 100644
index e4f964b3..00000000
--- a/test/mppa/instr/Makefile
+++ /dev/null
@@ -1,176 +0,0 @@
-SHELL := /bin/bash
-
-KVXC ?= k1-cos-gcc
-CC ?= gcc
-CCOMP ?= ccomp
-OPTIM ?= -O2
-CFLAGS ?= $(OPTIM)
-CCOMPFLAGS ?= $(CFLAGS)
-SIMU ?= k1-mppa
-TIMEOUT ?= --signal=SIGTERM 120s
-DIFF ?= python2.7 floatcmp.py -reltol .00001
-HARDRUN ?= k1-jtag-runner
-
-DIR=./
-SRCDIR=$(DIR)
-OUTDIR=$(DIR)/out
-BINDIR=$(DIR)/bin
-ASMDIR=$(DIR)/asm
-LIB=../lib/system.x86-gcc.a
-K1LIB=../lib/system.gcc.a
-
-##
-# Intended flow : .c -> .gcc.s -> .gcc.bin -> .gcc.out
-#                    -> .ccomp.s -> .ccomp.bin -> .ccomp.out
-##
-
-KVXCPATH=$(shell which $(KVXC))
-CCPATH=$(shell which $(CC))
-CCOMPPATH=$(shell which $(CCOMP))
-SIMUPATH=$(shell which $(SIMU))
-
-TESTNAMES?=$(notdir $(subst .c,,$(wildcard $(DIR)/*.c)))
-X86_GCC_OUT=$(addprefix $(OUTDIR)/,$(addsuffix .x86-gcc.out,$(TESTNAMES)))
-GCC_SIMUOUT=$(addprefix $(OUTDIR)/,$(addsuffix .gcc.simu.out,$(TESTNAMES)))
-CCOMP_SIMUOUT=$(addprefix $(OUTDIR)/,$(addsuffix .ccomp.simu.out,$(TESTNAMES)))
-GCC_HARDOUT=$(addprefix $(OUTDIR)/,$(addsuffix .gcc.hard.out,$(TESTNAMES)))
-CCOMP_HARDOUT=$(addprefix $(OUTDIR)/,$(addsuffix .ccomp.hard.out,$(TESTNAMES)))
-
-BIN=$(addprefix $(BINDIR)/,$(addsuffix .x86-gcc.bin,$(TESTNAMES)))\
-	$(addprefix $(BINDIR)/,$(addsuffix .gcc.bin,$(TESTNAMES)))\
-	$(addprefix $(BINDIR)/,$(addsuffix .ccomp.bin,$(TESTNAMES)))
-
-##
-# Targets
-##
-
-all: $(BIN)
-
-GREEN=\033[0;32m
-RED=\033[0;31m
-YELLOW=\033[0;33m
-NC=\033[0m
-
-.PHONY:
-test: simutest
-
-.PHONY:
-check: simucheck
-
-.PHONY: 
-simutest: $(X86_GCC_OUT) $(GCC_SIMUOUT)
-	@echo "Comparing x86 gcc output to k1 gcc.."
-	for test in $(TESTNAMES); do\
-		x86out=$(OUTDIR)/$$test.x86-gcc.out;\
-		gccout=$(OUTDIR)/$$test.gcc.simu.out;\
-		if grep "__KVX__" -q $$test.c; then\
-			printf "$(YELLOW)UNTESTED: $$test.c contains an \`#ifdef __KVX__\`\n";\
-		elif $(DIFF) $$x86out $$gccout > /dev/null; test $${PIPESTATUS[0]} -ne 0; then\
-			>&2 printf "$(RED)ERROR: $$x86out and $$gccout differ$(NC)\n";\
-		else\
-			printf "$(GREEN)GOOD: $$x86out and $$gccout concur$(NC)\n";\
-		fi;\
-	done
-
-.PHONY:
-simucheck: $(GCC_SIMUOUT) $(CCOMP_SIMUOUT)
-	@echo "Comparing k1 gcc output to ccomp.."
-	@for test in $(TESTNAMES); do\
-		gccout=$(OUTDIR)/$$test.gcc.simu.out;\
-		ccompout=$(OUTDIR)/$$test.ccomp.simu.out;\
-		if $(DIFF) $$ccompout $$gccout > /dev/null; test $${PIPESTATUS[0]} -ne 0; then\
-			>&2 printf "$(RED)ERROR: $$ccompout and $$gccout differ$(NC)\n";\
-		else\
-			printf "$(GREEN)GOOD: $$ccompout and $$gccout concur$(NC)\n";\
-		fi;\
-	done
-
-.PHONY: 
-hardtest: $(X86_GCC_OUT) $(GCC_HARDOUT)
-	@echo "Comparing x86 gcc output to k1 gcc.."
-	for test in $(TESTNAMES); do\
-		x86out=$(OUTDIR)/$$test.x86-gcc.out;\
-		gccout=$(OUTDIR)/$$test.gcc.hard.out;\
-		if grep "__KVX__" -q $$test.c; then\
-			printf "$(YELLOW)UNTESTED: $$test.c contains an \`#ifdef __KVX__\`\n";\
-		elif $(DIFF) $$x86out $$gccout > /dev/null; test $${PIPESTATUS[0]} -ne 0; then\
-			>&2 printf "$(RED)ERROR: $$x86out and $$gccout differ$(NC)\n";\
-		else\
-			printf "$(GREEN)GOOD: $$x86out and $$gccout concur$(NC)\n";\
-		fi;\
-	done
-
-.PHONY:
-hardcheck: $(GCC_HARDOUT) $(CCOMP_HARDOUT)
-	@echo "Comparing k1 gcc output to ccomp.."
-	@for test in $(TESTNAMES); do\
-		gccout=$(OUTDIR)/$$test.gcc.hard.out;\
-		ccompout=$(OUTDIR)/$$test.ccomp.hard.out;\
-		if $(DIFF) $$ccompout $$gccout > /dev/null; test $${PIPESTATUS[0]} -ne 0; then\
-			>&2 printf "$(RED)ERROR: $$ccompout and $$gccout differ$(NC)\n";\
-		else\
-			printf "$(GREEN)GOOD: $$ccompout and $$gccout concur$(NC)\n";\
-		fi;\
-	done
-
-##
-# Rules
-##
-
-.SECONDARY:
-$(LIB):
-	(cd $(dir $(LIB)) && make)
-
-$(K1LIB):
-	(cd $(dir $(LIB)) && make)
-
-# Generating output
-
-## Version avec timeout
-$(OUTDIR)/%.x86-gcc.out: $(BINDIR)/%.x86-gcc.bin
-	@mkdir -p $(@D)
-	ret=0; timeout $(TIMEOUT) ./$< > $@ || { ret=$$?; }; echo $$ret >> $@
-
-$(OUTDIR)/%.gcc.simu.out: $(BINDIR)/%.gcc.bin $(SIMUPATH)
-	@mkdir -p $(@D)
-	ret=0; timeout $(TIMEOUT) $(SIMU) -- $< > $@ || { ret=$$?; }; echo $$ret >> $@
-
-$(OUTDIR)/%.ccomp.simu.out: $(BINDIR)/%.ccomp.bin $(SIMUPATH)
-	@mkdir -p $(@D)
-	ret=0; timeout $(TIMEOUT) $(SIMU) -- $< > $@ || { ret=$$?; }; echo $$ret >> $@
-
-$(OUTDIR)/%.gcc.hard.out: $(BINDIR)/%.gcc.bin $(SIMUPATH)
-	@mkdir -p $(@D)
-	ret=0; timeout $(TIMEOUT) $(HARDRUN) --exec-file=Cluster0:$< > $@ || { ret=$$?; }; echo $$ret >> $@
-
-$(OUTDIR)/%.ccomp.hard.out: $(BINDIR)/%.ccomp.bin $(SIMUPATH)
-	@mkdir -p $(@D)
-	ret=0; timeout $(TIMEOUT) $(HARDRUN) --exec-file=Cluster0:$< > $@ || { ret=$$?; }; echo $$ret >> $@
-
-# Assembly to binary
-
-$(BINDIR)/%.x86-gcc.bin: $(ASMDIR)/%.x86-gcc.s $(LIB) $(CCPATH)
-	@mkdir -p $(@D)
-	$(CC) $(CFLAGS) $(filter-out $(CCPATH),$^) -o $@
-
-$(BINDIR)/%.gcc.bin: $(ASMDIR)/%.gcc.s $(K1LIB) $(KVXCPATH)
-	@mkdir -p $(@D)
-	$(KVXC) $(CFLAGS) $(filter-out $(KVXCPATH),$^) -o $@
-
-$(BINDIR)/%.ccomp.bin: $(ASMDIR)/%.ccomp.s $(K1LIB) $(CCOMPPATH)
-	@mkdir -p $(@D)
-	$(CCOMP) $(CCOMPFLAGS) $(filter-out $(CCOMPPATH),$^) -o $@
-
-# Source to assembly
-
-$(ASMDIR)/%.x86-gcc.s: $(SRCDIR)/%.c $(CCPATH)
-	@mkdir -p $(@D)
-	$(CC) $(CFLAGS) -S $< -o $@
-
-$(ASMDIR)/%.gcc.s: $(SRCDIR)/%.c $(KVXCPATH)
-	@mkdir -p $(@D)
-	$(KVXC) $(CFLAGS) -S $< -o $@
-
-$(ASMDIR)/%.ccomp.s: $(SRCDIR)/%.c $(CCOMPPATH)
-	@mkdir -p $(@D)
-	$(CCOMP) $(CCOMPFLAGS) -S $< -o $@
diff --git a/test/mppa/instr/builtin32.c b/test/mppa/instr/builtin32.c
deleted file mode 100644
index 9efb33cd..00000000
--- a/test/mppa/instr/builtin32.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-  int *ptr = &c;
-#ifdef __KVX__
-  int d = c;
-  a = __builtin_kvx_alclrw(ptr);
-  c = d;
-
-#endif
-END_TEST32()
-
diff --git a/test/mppa/instr/builtin64.c b/test/mppa/instr/builtin64.c
deleted file mode 100644
index 252eb2c6..00000000
--- a/test/mppa/instr/builtin64.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-  long long *ptr = &c;
-#ifdef __KVX__
-  long long d = c;
-  a = __builtin_kvx_alclrd(ptr);
-  c = d;
-  c += a;
-
-  c += __builtin_clzll(a);
-
-  /* Removed the AFADDD builtin who was incorrect in CompCert, see #157 */
-  // a = __builtin_kvx_afaddd(ptr, a);
-  // a = __builtin_kvx_afaddd(ptr, a);
-#endif
-END_TEST64()
diff --git a/test/mppa/instr/div32.c b/test/mppa/instr/div32.c
deleted file mode 100644
index 83c3a0e3..00000000
--- a/test/mppa/instr/div32.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-    c = a/b;
-END_TEST32()
diff --git a/test/mppa/instr/divf32.c b/test/mppa/instr/divf32.c
deleted file mode 100644
index 513a3293..00000000
--- a/test/mppa/instr/divf32.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(float)
-  c = a / b;
-END_TESTF32()
diff --git a/test/mppa/instr/divf64.c b/test/mppa/instr/divf64.c
deleted file mode 100644
index 0dd23826..00000000
--- a/test/mppa/instr/divf64.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(double)
-  c = a / b;
-END_TESTF64()
diff --git a/test/mppa/instr/divu32.c b/test/mppa/instr/divu32.c
deleted file mode 100644
index 1fe196c4..00000000
--- a/test/mppa/instr/divu32.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned int)
-{
-    c = a/b;
-}
-END_TEST32()
diff --git a/test/mppa/instr/f32.c b/test/mppa/instr/f32.c
deleted file mode 100644
index 7e304aeb..00000000
--- a/test/mppa/instr/f32.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(float)
-    c = ((float)a + (float)b);
-    c += ((float)a * (float)b);
-    c += (-(float)a);
-    c += ((float)a - (float)b);
-END_TESTF32()
diff --git a/test/mppa/instr/f64.c b/test/mppa/instr/f64.c
deleted file mode 100644
index be8094c9..00000000
--- a/test/mppa/instr/f64.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(double)
-    c = ((double)a + (double)b);
-    c += ((double)a * (double)b);
-    c += (-(double)a);
-    c += ((double)a - (double)b);
-END_TESTF64()
diff --git a/test/mppa/instr/floatcmp.py b/test/mppa/instr/floatcmp.py
deleted file mode 100755
index 49f1bc13..00000000
--- a/test/mppa/instr/floatcmp.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/python2.7
-
-import argparse as ap
-import sys
-
-parser = ap.ArgumentParser()
-parser.add_argument("file1", help="First file to compare")
-parser.add_argument("file2", help="Second file to compare")
-parser.add_argument("-reltol", help="Relative error")
-parser.add_argument("-abstol", help="Absolute error")
-parser.add_argument("-s", help="Silent output", action="store_true")
-args = parser.parse_args()
-
-reltol = float(args.reltol) if args.reltol else None
-abstol = float(args.abstol) if args.abstol else None
-silent = args.s
-
-if silent:
-    sys.stdout = open("/dev/null", "w")
-
-import re
-from math import fabs
-
-def floatcmp(f1, f2):
-    if abstol:
-        if fabs(f1 - f2) > abstol:
-            return False
-    if reltol:
-        if f2 != 0. and fabs((f1 - f2) / f2) > reltol:
-            return False
-    return True
-
-class Parsed(list):
-    def __eq__(self, other):
-        if len(self) != len(other):
-            return False
-        comps = zip(self, other)
-        for comp in comps:
-            if all(isinstance(compElt, str) for compElt in comp):
-                if comp[0] != comp[1]:
-                    return False
-            elif all (isinstance(compElt, float) for compElt in comp):
-                if not floatcmp(comp[0], comp[1]):
-                    return False
-            else:
-                return False
-        return True
-    
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-parseLine = re.compile(r"\s*(\S+)")
-def readline(line):
-    words = parseLine.findall(line)
-    parsed = Parsed([])
-    for word in words:
-        try:
-            parse = float(word)
-            parsed.append(parse)
-        except ValueError:
-            parsed.append(word)
-    return parsed
-
-def readfile(filename):
-    L = []
-    try:
-        with open(filename) as f:
-            for line in f:
-                L.append(readline(line))
-    except IOError:
-        print "Unable to read {}".format(filename)
-        sys.exit(2)
-    return L
-
-L1 = readfile(args.file1)
-L2 = readfile(args.file2)
-
-if len(L1) != len(L2):
-    print "The files have different amount of lines"
-    print "\t{}: {} lines".format(args.file1, len(L1))
-    print "\t{}: {} lines".format(args.file2, len(L2))
-    sys.exit(1)
-
-cmpL = zip(L1, L2)
-for i, cmpElt in enumerate(cmpL):
-    if cmpElt[0] != cmpElt[1]:
-        print "The files differ at line {}".format(i)
-        print "\t{}: {}".format(args.file1, cmpElt[0])
-        print "\t{}: {}".format(args.file2, cmpElt[1])
-        sys.exit(1)
-
-print "Comparison succeeded"
-sys.exit(0)
diff --git a/test/mppa/instr/framework.h b/test/mppa/instr/framework.h
deleted file mode 100644
index 3bbfa271..00000000
--- a/test/mppa/instr/framework.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef __FRAMEWORK_H__
-#define __FRAMEWORK_H__
-
-#include <stdio.h>
-#include "../prng/prng.c"
-
-#define BEGIN_TEST_N(type, N)\
-    int main(void){\
-        type t[N], c, i, j, S;\
-        srand(0);\
-        S = 0;\
-        for (i = 0 ; i < 100 ; i++){\
-            c = randlong();\
-            for (j = 0 ; j < N ; j++)\
-                t[j] = randlong();\
-    /* END BEGIN_TEST_N */
-
-#define BEGIN_TEST(type)\
-    int main(void){\
-        type a, b, c, S;\
-        int i;\
-        srand(0);\
-        S = 0;\
-        for (i = 0 ; i < 100 ; i++){\
-            c = randlong();\
-            a = randlong();\
-            b = randlong();
-    /* END BEGIN_TEST */
-            
-/* In between BEGIN_TEST and END_TEST : definition of c */
-
-#define END_TEST64()\
-            printf("%llu\t%llu\t%llu\n", a, b, c);\
-            S += c;\
-        }\
-        return S;\
-    }
-    /* END END_TEST64 */
-
-#define END_TEST32()\
-            printf("%u\t%u\t%u\n", a, b, c);\
-            S += c;\
-        }\
-        return S;\
-    }
-    /* END END_TEST32 */
-
-#define END_TESTF32()\
-            printf("%e\t%e\t%e\n", a, b, c);\
-            S += c;\
-        }\
-        return 0;\
-    }
-    /* END END_TESTF32 */
-
-#define END_TESTF64()\
-            printf("%e\t%e\t%e\n", a, b, c);\
-            S += c;\
-        }\
-        return 0;\
-    }
-    /* END END_TESTF64 */
-
-#endif
-
-
diff --git a/test/mppa/instr/i32.c b/test/mppa/instr/i32.c
deleted file mode 100644
index e350931c..00000000
--- a/test/mppa/instr/i32.c
+++ /dev/null
@@ -1,149 +0,0 @@
-#include "framework.h"
-
-int sum(int a, int b){
-    return a+b;
-}
-
-int make(int a){
-    return a;
-}
-
-int tailsum(int a, int b){
-    return make(a+b);
-}
-
-int fact(int a){
-  int r = 1;
-  int i;
-  for (i = 1; i < a; i++)
-    r *= i;
-  return r;
-}
-
-float int2float(int v){
-  return v;
-}
-
-BEGIN_TEST(int)
-    c = a+b;
-    c += a&b;
-
-    /* testing if, cb version */
-    if ((a & 0x1) == 1)
-        c += fact(1);
-    else
-        c += fact(2);
-
-    if (a & 0x1 == 0)
-        c += fact(4);
-    else
-        c += fact(8);
-
-    if (a & 0x1 == 0)
-        c += fact(4);
-    else
-        c += fact(8);
-
-    b = !(a & 0x01);
-    if (!b)
-        c += fact(16);
-    else
-        c += fact(32);
-
-    c += sum(make(a), make(b));
-    c += (long long) a;
-
-    if (0 > (a & 0x1) - 1)
-        c += fact(64);
-    else
-        c += fact(128);
-
-    if (0 >= (a & 0x1))
-        c += fact(256);
-    else
-        c += fact(512);
-
-    if ((a & 0x1) > 0)
-        c += fact(1024);
-    else
-        c += fact(2048);
-
-    if ((a & 0x1) - 1 >= 0)
-        c += fact(4096);
-    else
-        c += fact(8192);
-
-    /* cmoved version */
-    if ((a & 0x1) == 1)
-        c += 1;
-    else
-        c += 2;
-
-    if (a & 0x1 == 0)
-        c += 4;
-    else
-        c += 8;
-
-    if (a & 0x1 == 0)
-        c += 4;
-    else
-        c += 8;
-
-    b = !(a & 0x01);
-    if (!b)
-        c += 16;
-    else
-        c += 32;
-
-    if (0 > (a & 0x1) - 1)
-        c += 64;
-    else
-        c += 128;
-
-    if (0 >= (a & 0x1))
-        c += 256;
-    else
-        c += 512;
-
-    if ((a & 0x1) > 0)
-        c += 1024;
-    else
-        c += 2048;
-
-    if ((a & 0x1) - 1 >= 0)
-        c += 4096;
-    else
-        c += 8192;
-
-    c += ((a & 0x1) == (b & 0x1));
-    c += (a > b);
-    c += (a <= b);
-    c += (a < b);
-    c += (a + b) / 2;
-    c += (int) int2float(a) + (int) int2float(b) + (int) int2float(42.3);
-    c += (a << 4); // addx16w
-    c += (a << 3); // addx8w
-    c += (a << 2); // addx4w
-    c += (a << 1); // addx2w
-
-    c += ~a & b; // andnw
-
-    int j;
-    for (j = 0 ; j < 10 ; j++)
-        c += a;
-    int k;
-    for (k = 0 ; k < (b & 0x8) ; k++)
-        c += a;
-
-    char s[] = "Tome and Cherry at the playa\n";
-    c += s[(a & (sizeof(s)-1))];
-
-    unsigned char s2[] = "Tim is sorry at the playa\n";
-    c += s2[a & (sizeof(s) - 1)];
-
-    c += a*b;
-    c += a-b;
-    c += a << (b & 0x8);
-
-    c += sum(a, b);
-END_TEST32()
diff --git a/test/mppa/instr/i64.c b/test/mppa/instr/i64.c
deleted file mode 100644
index e869d93c..00000000
--- a/test/mppa/instr/i64.c
+++ /dev/null
@@ -1,169 +0,0 @@
-#include "framework.h"
-
-long long sum(long long a, long long b){
-  return a+b;
-}
-
-long long diff(long long a, long long b){
-  return a-b;
-}
-
-long long mul(long long a, long long b){
-  return a*b;
-}
-
-long long make(long long a){
-  return a;
-}
-
-long long random_op(long long a, long long b){
-  long long d = 3;
-  long long (*op)(long long, long long);
-
-  if (a % d == 0)
-    op = sum;
-  else if (a % d == 1)
-    op = diff;
-  else
-    op = mul;
-
-  return op(a, b);
-}
-
-long fact(long a){
-  long r = 1;
-  long i;
-  for (i = 1; i < a; i++)
-    r *= i;
-  return r;
-}
-
-double long2double(long v){
-  return v;
-}
-
-BEGIN_TEST(long long)
-    c = a&b;
-    c += a*b;
-    c += -a;
-    c += a | b;
-    c += a-b;
-    c += a >> (b & 0x8LL);
-    c += a >> (b & 0x8ULL);
-    c += a % b;
-    c += (a << 4); // addx16d
-    c += (a << 3); // addx8d
-    c += (a << 2); // addx4d
-    c += (a << 1); // addx2d
-
-    c += ~a & b; // andnd
-
-  long long d = 3;
-  long long (*op)(long long, long long);
-
-  if (a % d == 0)
-    op = sum;
-  else if (a % d == 1)
-    op = diff;
-  else
-    op = mul;
-
-  c += op(make(a), make(b));
-  c += random_op(a, b);
-    c += a/b;
-    c += a^b;
-    c += (unsigned int) a;
-
-    /* Testing if, cb */
-    if (0 != (a & 0x1LL))
-        c += fact(1);
-    else
-        c += fact(2);
-
-    if (0 > (a & 0x1LL))
-        c += fact(4);
-    else
-        c += fact(8);
-
-    if (0 >= (a & 0x1LL) - 1)
-        c += fact(16);
-    else
-        c += fact(32);
-
-    if ((unsigned long long)(a & 0x1LL) >= 1)
-        c += fact(18);
-    else
-        c += fact(31);
-
-
-    if (a-41414141 > 0)
-        c += fact(13);
-    else
-        c += fact(31);
-
-    if (a & 0x1LL > 0)
-        c += fact(64);
-    else
-        c += fact(128);
-
-    if ((a & 0x1LL) - 1 >= 0)
-        c += fact(256);
-    else
-        c += fact(512);
-
-    if (0 == (a & 0x1LL))
-        c += fact(1024);
-    else
-        c += fact(2048);
-
-    /* Testing if, cmoved */
-    if (0 != (a & 0x1LL))
-        c += 1;
-    else
-        c += 2;
-
-    if (0 > (a & 0x1LL))
-        c += 4;
-    else
-        c += 8;
-
-    if (0 >= (a & 0x1LL) - 1)
-        c += 16;
-    else
-        c += 32;
-
-    if (a-41414141 > 0)
-        c += 13;
-    else
-        c += 31;
-
-    if (a & 0x1LL > 0)
-        c += 64;
-    else
-        c += 128;
-
-    if ((a & 0x1LL) - 1 >= 0)
-        c += 256;
-    else
-        c += 512;
-
-    if (0 == (a & 0x1LL))
-        c += 1024;
-    else
-        c += 2048;
-
-    c += ((a & 0x1LL) == (b & 0x1LL));
-    c += (a >= b);
-    c += (a > b);
-    c += (a <= b);
-    c += (a < b);
-    c += (long) long2double(a) + (long) long2double(b) + (long) long2double(42.3);
-
-    int j;
-
-    for (j = 0 ; j < (b & 0x8LL) ; j++)
-        c += a;
-
-    c += ((a & 0x1LL) == (b & 0x1LL));
-
-END_TEST64()
diff --git a/test/mppa/instr/individual/andw.c b/test/mppa/instr/individual/andw.c
deleted file mode 100644
index 799dc7fb..00000000
--- a/test/mppa/instr/individual/andw.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-    c = a&b;
-END_TEST32()
diff --git a/test/mppa/instr/individual/branch.c b/test/mppa/instr/individual/branch.c
deleted file mode 100644
index c9937e31..00000000
--- a/test/mppa/instr/individual/branch.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    if ((a & 0x1) == 1)
-        c = 0;
-    else
-        c = 1;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/branchz.c b/test/mppa/instr/individual/branchz.c
deleted file mode 100644
index d3e021b5..00000000
--- a/test/mppa/instr/individual/branchz.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    if (a & 0x1 == 0)
-        c = 0;
-    else
-        c = 1;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/branchzu.c b/test/mppa/instr/individual/branchzu.c
deleted file mode 100644
index d0169174..00000000
--- a/test/mppa/instr/individual/branchzu.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    b = !(a & 0x01);
-    if (!b)
-        c = 0;
-    else
-        c = 1;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/call.c b/test/mppa/instr/individual/call.c
deleted file mode 100644
index ba2ec323..00000000
--- a/test/mppa/instr/individual/call.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "framework.h"
-
-int sum(int a, int b){
-    return a+b;
-}
-
-int make(int a){
-    return a;
-}
-
-BEGIN_TEST(int)
-{
-    c = sum(make(a), make(b));
-}
-END_TEST32()
-/* RETURN VALUE: 60 */
diff --git a/test/mppa/instr/individual/cast_S32_S64.c b/test/mppa/instr/individual/cast_S32_S64.c
deleted file mode 100644
index 09c97e00..00000000
--- a/test/mppa/instr/individual/cast_S32_S64.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = (long long) a;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/cast_S64_U32.c b/test/mppa/instr/individual/cast_S64_U32.c
deleted file mode 100644
index 2d9dc723..00000000
--- a/test/mppa/instr/individual/cast_S64_U32.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = (unsigned int) a;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/cb.deqz.c b/test/mppa/instr/individual/cb.deqz.c
deleted file mode 100644
index 6da2ab07..00000000
--- a/test/mppa/instr/individual/cb.deqz.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    if (0 != (a & 0x1LL))
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/cb.dgez.c b/test/mppa/instr/individual/cb.dgez.c
deleted file mode 100644
index 7bef25ad..00000000
--- a/test/mppa/instr/individual/cb.dgez.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    if (0 > (a & 0x1LL))
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/cb.dgtz.c b/test/mppa/instr/individual/cb.dgtz.c
deleted file mode 100644
index 1a43fb1f..00000000
--- a/test/mppa/instr/individual/cb.dgtz.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    if (0 >= (a & 0x1LL) - 1)
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/cb.dlez.c b/test/mppa/instr/individual/cb.dlez.c
deleted file mode 100644
index 2fb97939..00000000
--- a/test/mppa/instr/individual/cb.dlez.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    if (a & 0x1LL > 0)
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/cb.dltz.c b/test/mppa/instr/individual/cb.dltz.c
deleted file mode 100644
index a431d5d0..00000000
--- a/test/mppa/instr/individual/cb.dltz.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    if ((a & 0x1LL) - 1 >= 0)
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/cb.dnez.c b/test/mppa/instr/individual/cb.dnez.c
deleted file mode 100644
index 44516cbe..00000000
--- a/test/mppa/instr/individual/cb.dnez.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    if (0 == (a & 0x1LL))
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/cb.wgez.c b/test/mppa/instr/individual/cb.wgez.c
deleted file mode 100644
index 5779ad92..00000000
--- a/test/mppa/instr/individual/cb.wgez.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    if (0 > (a & 0x1) - 1)
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/cb.wgtz.c b/test/mppa/instr/individual/cb.wgtz.c
deleted file mode 100644
index abb695bd..00000000
--- a/test/mppa/instr/individual/cb.wgtz.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    if (0 >= (a & 0x1))
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/cb.wlez.c b/test/mppa/instr/individual/cb.wlez.c
deleted file mode 100644
index 3a2e08c1..00000000
--- a/test/mppa/instr/individual/cb.wlez.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    if ((a & 0x1) > 0)
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/cb.wltz.c b/test/mppa/instr/individual/cb.wltz.c
deleted file mode 100644
index 5d52c72a..00000000
--- a/test/mppa/instr/individual/cb.wltz.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    if ((a & 0x1) - 1 >= 0)
-        c = 1;
-    else
-        c = 0;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compd.eq.c b/test/mppa/instr/individual/compd.eq.c
deleted file mode 100644
index 4fe8de2a..00000000
--- a/test/mppa/instr/individual/compd.eq.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = ((a & 0x1LL) == (b & 0x1LL));
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/compd.geu.c b/test/mppa/instr/individual/compd.geu.c
deleted file mode 100644
index fccf0804..00000000
--- a/test/mppa/instr/individual/compd.geu.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned long long)
-{
-    c = (a >= b);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/compd.gt.c b/test/mppa/instr/individual/compd.gt.c
deleted file mode 100644
index b9901436..00000000
--- a/test/mppa/instr/individual/compd.gt.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = (a > b);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/compd.le.c b/test/mppa/instr/individual/compd.le.c
deleted file mode 100644
index 6fa0f103..00000000
--- a/test/mppa/instr/individual/compd.le.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = (a <= b);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/compd.leu.c b/test/mppa/instr/individual/compd.leu.c
deleted file mode 100644
index 1ad18281..00000000
--- a/test/mppa/instr/individual/compd.leu.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned long long)
-{
-    c = (a <= b);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/compd.lt.c b/test/mppa/instr/individual/compd.lt.c
deleted file mode 100644
index c42cda56..00000000
--- a/test/mppa/instr/individual/compd.lt.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = (a < b);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/compd.ltu.c b/test/mppa/instr/individual/compd.ltu.c
deleted file mode 100644
index b03d4d53..00000000
--- a/test/mppa/instr/individual/compd.ltu.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned long long)
-{
-    c = (a < b);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/compd.ne.c b/test/mppa/instr/individual/compd.ne.c
deleted file mode 100644
index fd9d0b28..00000000
--- a/test/mppa/instr/individual/compd.ne.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned long long)
-{
-    c = ((a & 0x1ULL) != (b & 0x1ULL));
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/compw.eq.c b/test/mppa/instr/individual/compw.eq.c
deleted file mode 100644
index cd93f365..00000000
--- a/test/mppa/instr/individual/compw.eq.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = ((a & 0x1) == (b & 0x1));
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compw.geu.c b/test/mppa/instr/individual/compw.geu.c
deleted file mode 100644
index b8fb1adf..00000000
--- a/test/mppa/instr/individual/compw.geu.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned int)
-{
-    c = (a >= b);
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compw.gt.c b/test/mppa/instr/individual/compw.gt.c
deleted file mode 100644
index 5f6bc907..00000000
--- a/test/mppa/instr/individual/compw.gt.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = (a > b);
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compw.gtu.c b/test/mppa/instr/individual/compw.gtu.c
deleted file mode 100644
index 947f6a14..00000000
--- a/test/mppa/instr/individual/compw.gtu.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned int)
-{
-    c = (a > b);
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compw.le.c b/test/mppa/instr/individual/compw.le.c
deleted file mode 100644
index 35ec6b7d..00000000
--- a/test/mppa/instr/individual/compw.le.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = (a <= b);
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compw.leu.c b/test/mppa/instr/individual/compw.leu.c
deleted file mode 100644
index 74ebfb42..00000000
--- a/test/mppa/instr/individual/compw.leu.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned int)
-{
-    c = (a <= b);
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compw.lt.c b/test/mppa/instr/individual/compw.lt.c
deleted file mode 100644
index cb1f30bd..00000000
--- a/test/mppa/instr/individual/compw.lt.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = (a < b);
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compw.ltu.c b/test/mppa/instr/individual/compw.ltu.c
deleted file mode 100644
index 6a0c5af1..00000000
--- a/test/mppa/instr/individual/compw.ltu.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned int)
-{
-    c = (a < b);
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/compw.ne.c b/test/mppa/instr/individual/compw.ne.c
deleted file mode 100644
index 7035e2c7..00000000
--- a/test/mppa/instr/individual/compw.ne.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned int)
-{
-    c = ((a & 0x1U) != (b & 0x1U));
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/div2.c b/test/mppa/instr/individual/div2.c
deleted file mode 100644
index b5dfe63a..00000000
--- a/test/mppa/instr/individual/div2.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = (a + b) / 2;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/doubleconv.c b/test/mppa/instr/individual/doubleconv.c
deleted file mode 100644
index 55b1ddab..00000000
--- a/test/mppa/instr/individual/doubleconv.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "framework.h"
-
-double long2double(long v){
-  return v;
-}
-
-BEGIN_TEST(long)
-    c = (long) long2double(a) + (long) long2double(b) + (long) long2double(42.3);
-END_TEST64()
diff --git a/test/mppa/instr/individual/floatconv.c b/test/mppa/instr/individual/floatconv.c
deleted file mode 100644
index 32b798e1..00000000
--- a/test/mppa/instr/individual/floatconv.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "framework.h"
-
-float int2float(int v){
-  return v;
-}
-
-BEGIN_TEST(int)
-    c = (int) int2float(a) + (int) int2float(b) + (int) int2float(42.3);
-END_TEST32()
diff --git a/test/mppa/instr/individual/fmuld.c b/test/mppa/instr/individual/fmuld.c
deleted file mode 100644
index 03c990fa..00000000
--- a/test/mppa/instr/individual/fmuld.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(double)
-{
-    c = ((double)a * (double)b);
-}
-END_TESTF64()
diff --git a/test/mppa/instr/individual/fmulw.c b/test/mppa/instr/individual/fmulw.c
deleted file mode 100644
index f85eba64..00000000
--- a/test/mppa/instr/individual/fmulw.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(float)
-{
-    c = ((float)a * (float)b);
-}
-END_TESTF32()
diff --git a/test/mppa/instr/individual/fnegd.c b/test/mppa/instr/individual/fnegd.c
deleted file mode 100644
index 974eb7e8..00000000
--- a/test/mppa/instr/individual/fnegd.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(double)
-{
-    c = (-(double)a);
-}
-END_TESTF64()
diff --git a/test/mppa/instr/individual/fnegw.c b/test/mppa/instr/individual/fnegw.c
deleted file mode 100644
index fbeaab8e..00000000
--- a/test/mppa/instr/individual/fnegw.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(float)
-{
-    c = (-(float)a);
-}
-END_TESTF64()
diff --git a/test/mppa/instr/individual/for.c b/test/mppa/instr/individual/for.c
deleted file mode 100644
index 373ab6bd..00000000
--- a/test/mppa/instr/individual/for.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    int j;
-    for (j = 0 ; j < 10 ; j++)
-        c += a;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/forvar.c b/test/mppa/instr/individual/forvar.c
deleted file mode 100644
index 9e43c198..00000000
--- a/test/mppa/instr/individual/forvar.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    int k;
-    for (k = 0 ; k < (b & 0x8) ; k++)
-        c += a;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/forvarl.c b/test/mppa/instr/individual/forvarl.c
deleted file mode 100644
index c1fe90fd..00000000
--- a/test/mppa/instr/individual/forvarl.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long int)
-{
-    int j;
-
-    for (j = 0 ; j < (b & 0x8LL) ; j++)
-        c += a;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/fsbfd.c b/test/mppa/instr/individual/fsbfd.c
deleted file mode 100644
index f80c1efe..00000000
--- a/test/mppa/instr/individual/fsbfd.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(double)
-{
-    c = ((double)a - (double)b);
-}
-END_TESTF64()
diff --git a/test/mppa/instr/individual/fsbfw.c b/test/mppa/instr/individual/fsbfw.c
deleted file mode 100644
index 067c40b5..00000000
--- a/test/mppa/instr/individual/fsbfw.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(float)
-{
-    c = ((float)a - (float)b);
-}
-END_TESTF64()
diff --git a/test/mppa/instr/individual/indirect_call.c b/test/mppa/instr/individual/indirect_call.c
deleted file mode 100644
index f376c00a..00000000
--- a/test/mppa/instr/individual/indirect_call.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "framework.h"
-
-long long sum(long long a, long long b){
-  return a+b;
-}
-
-long long diff(long long a, long long b){
-  return a-b;
-}
-
-long long mul(long long a, long long b){
-  return a*b;
-}
-
-long long make(long long a){
-  return a;
-}
-
-BEGIN_TEST(long long)
-{
-  long long d = 3;
-  long long (*op)(long long, long long);
-
-  if (a % d == 0)
-    op = sum;
-  else if (a % d == 1)
-    op = diff;
-  else
-    op = mul;
-
-  c += op(make(a), make(b));
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/indirect_tailcall.c b/test/mppa/instr/individual/indirect_tailcall.c
deleted file mode 100644
index e6c16ea1..00000000
--- a/test/mppa/instr/individual/indirect_tailcall.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "framework.h"
-
-long long sum(long long a, long long b){
-  return a+b;
-}
-
-long long diff(long long a, long long b){
-  return a-b;
-}
-
-long long mul(long long a, long long b){
-  return a*b;
-}
-
-long long random_op(long long a, long long b){
-  long long d = 3;
-  long long (*op)(long long, long long);
-
-  if (a % d == 0)
-    op = sum;
-  else if (a % d == 1)
-    op = diff;
-  else
-    op = mul;
-
-  return op(a, b);
-}
-
-BEGIN_TEST(long long)
-{
-  c += random_op(a, b);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/lbs.c b/test/mppa/instr/individual/lbs.c
deleted file mode 100644
index 22a50632..00000000
--- a/test/mppa/instr/individual/lbs.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    char s[] = "Tome and Cherry at the playa\n";
-
-    c = s[(a & (sizeof(s)-1))];
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/lbz.c b/test/mppa/instr/individual/lbz.c
deleted file mode 100644
index 04ba098d..00000000
--- a/test/mppa/instr/individual/lbz.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    unsigned char s[] = "Tim is sorry at the playa\n";
-
-    c = s[a & (sizeof(s) - 1)];
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/muld.c b/test/mppa/instr/individual/muld.c
deleted file mode 100644
index f7e23850..00000000
--- a/test/mppa/instr/individual/muld.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = a*b;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/mulw.c b/test/mppa/instr/individual/mulw.c
deleted file mode 100644
index a91d966e..00000000
--- a/test/mppa/instr/individual/mulw.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = a * b;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/negd.c b/test/mppa/instr/individual/negd.c
deleted file mode 100644
index 837b9828..00000000
--- a/test/mppa/instr/individual/negd.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = -a;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/ord.c b/test/mppa/instr/individual/ord.c
deleted file mode 100644
index cae1ae8b..00000000
--- a/test/mppa/instr/individual/ord.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = a | b;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/sbfd.c b/test/mppa/instr/individual/sbfd.c
deleted file mode 100644
index 77c28c77..00000000
--- a/test/mppa/instr/individual/sbfd.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = a-b;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/sbfw.c b/test/mppa/instr/individual/sbfw.c
deleted file mode 100644
index e38a1fff..00000000
--- a/test/mppa/instr/individual/sbfw.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = a-b;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/simple.c b/test/mppa/instr/individual/simple.c
deleted file mode 100644
index 944f09c9..00000000
--- a/test/mppa/instr/individual/simple.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = a+b;
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/sllw.c b/test/mppa/instr/individual/sllw.c
deleted file mode 100644
index 6dd41a6c..00000000
--- a/test/mppa/instr/individual/sllw.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-{
-    c = a << (b & 0x8);
-}
-END_TEST32()
diff --git a/test/mppa/instr/individual/srad.c b/test/mppa/instr/individual/srad.c
deleted file mode 100644
index 00be9d0c..00000000
--- a/test/mppa/instr/individual/srad.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = a >> (b & 0x8LL);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/srld.c b/test/mppa/instr/individual/srld.c
deleted file mode 100644
index 14970efd..00000000
--- a/test/mppa/instr/individual/srld.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned long long)
-{
-    c = a >> (b & 0x8ULL);
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/tailcall.c b/test/mppa/instr/individual/tailcall.c
deleted file mode 100644
index 6c659a01..00000000
--- a/test/mppa/instr/individual/tailcall.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "framework.h"
-
-int make(int a){
-  return a;
-}
-
-int sum(int a, int b){
-    return make(a+b);
-}
-
-BEGIN_TEST(int)
-{
-    c = sum(a, b);
-}
-END_TEST32()
-/* RETURN VALUE: 60 */
diff --git a/test/mppa/instr/individual/udivd.c b/test/mppa/instr/individual/udivd.c
deleted file mode 100644
index cfb31881..00000000
--- a/test/mppa/instr/individual/udivd.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned long long)
-{
-    c = a/b;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/umodd.c b/test/mppa/instr/individual/umodd.c
deleted file mode 100644
index a7f25f1c..00000000
--- a/test/mppa/instr/individual/umodd.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned long long)
-{
-    c = a%b;
-}
-END_TEST64()
diff --git a/test/mppa/instr/individual/xord.c b/test/mppa/instr/individual/xord.c
deleted file mode 100644
index b6a90cb0..00000000
--- a/test/mppa/instr/individual/xord.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(long long)
-{
-    c = a^b;
-}
-END_TEST64()
diff --git a/test/mppa/instr/modi32.c b/test/mppa/instr/modi32.c
deleted file mode 100644
index 958ae920..00000000
--- a/test/mppa/instr/modi32.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(int)
-    c = a%b;
-END_TEST32()
diff --git a/test/mppa/instr/modui32.c b/test/mppa/instr/modui32.c
deleted file mode 100644
index a39034a8..00000000
--- a/test/mppa/instr/modui32.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned int)
-{
-    c = a%b;
-}
-END_TEST32()
diff --git a/test/mppa/instr/ui32.c b/test/mppa/instr/ui32.c
deleted file mode 100644
index f56a9b95..00000000
--- a/test/mppa/instr/ui32.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned int)
-{
-    c = (long long) a;
-    c += (a >= b);
-    c += (a > b);
-    c += (a <= b);
-    c += (a < b);
-    c += ((a & 0x1U) != (b & 0x1U));
-}
-END_TEST32()
diff --git a/test/mppa/instr/ui64.c b/test/mppa/instr/ui64.c
deleted file mode 100644
index 908dec3c..00000000
--- a/test/mppa/instr/ui64.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "framework.h"
-
-BEGIN_TEST(unsigned long long)
-{
-    c = (a > b);
-    c += (a <= b);
-    c += (a < b);
-    c += ((a & 0x1ULL) != (b & 0x1ULL));
-}
-END_TEST64()