Update handcomp_tests for C++ runtime

Author: VoxSciurorum

handcomp_test/Makefile

@@ -1,8 +1,8 @@
 include ../config.mk
 
-SRCS = $(wildcard *.c)
+SRCS = $(wildcard *.cpp)
 HDRS = $(wildcard *.h)
-OBJS = $(patsubst %.c,%.o,$(SRCS))
+OBJS = $(patsubst %.cpp,%.o,$(SRCS))
 
 DEFINES = $(ABI_DEF)
 
@@ -21,11 +21,14 @@ TIMING_COUNT ?= 1
 all: $(TESTS)
 
 $(TESTS): %: %.o ktiming.o getoptions.o ZERO.o
-	$(CC) $^ -o $@ $(RTS_LIBS) -lrt -lpthread -lm
+	$(CXX) $^ -o $@ $(RTS_LIBS) -lrt -lpthread -lm
 
 %.o: %.c
 	$(CC) -c $(OPTIONS) -DTIMING_COUNT=$(TIMING_COUNT) -o $@ $<
 
+%.o: %.cpp
+	$(CXX) -c $(OPTIONS) -DTIMING_COUNT=$(TIMING_COUNT) -o $@ $<
+
 memcheck: 
 	$(MAKE) clean; $(MAKE) > /dev/null
 	date

handcomp_test/cilksort.c handcomp_test/cilksort.cpphandcomp_test/cilksort.c renamed to handcomp_test/cilksort.cpp

@@ -59,7 +59,7 @@
 #include <string.h>
 
 #include "../runtime/cilk2c.h"
-#include "../runtime/cilk2c_inlined.c"
+#include "../runtime/cilk2c_inlined.cpp"
 #include "ktiming.h"
 #include "getoptions.h"
 

handcomp_test/fib.c handcomp_test/fib.cpphandcomp_test/fib.c renamed to handcomp_test/fib.cpp

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "../runtime/cilk2c.h"
-#include "../runtime/cilk2c_inlined.c"
+#include "../runtime/cilk2c_inlined.cpp"
 #include "ktiming.h"
 
 

handcomp_test/getoptions.c handcomp_test/getoptions.cpphandcomp_test/getoptions.c renamed to handcomp_test/getoptions.cpp

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "../runtime/cilk2c.h"
-#include "../runtime/cilk2c_inlined.c"
+#include "../runtime/cilk2c_inlined.cpp"
 #include "ktiming.h"
 #include "getoptions.h"
 

handcomp_test/ktiming.c handcomp_test/ktiming.cpphandcomp_test/ktiming.c renamed to handcomp_test/ktiming.cpp

@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include "../runtime/cilk2c.h"
-#include "../runtime/cilk2c_inlined.c"
+#include "../runtime/cilk2c_inlined.cpp"
 #include "ktiming.h"
 
 extern size_t ZERO;

handcomp_test/mm_dac.c handcomp_test/mm_dac.cpphandcomp_test/mm_dac.c renamed to handcomp_test/mm_dac.cpp

@@ -8,9 +8,9 @@ REDUCER_DEF = -DREDUCER_MODULE
 RESOURCE_DIR=$(realpath ..)
 MAIN = $(RTS_LIBDIR)/$(RTS_LIB)
 BITCODE_ABI = $(MAIN)-abi.bc
-SRCS = $(filter-out pedigree_ext.c $(PEDIGREE_LIB_SRC).c $(PERSON_C_SRC).c $(PERSON_CPP_SRC).cpp, $(wildcard *.c))
+SRCS = $(filter-out pedigree_ext.cpp $(PEDIGREE_LIB_SRC).cpp $(PERSON_C_SRC).c $(PERSON_CPP_SRC).cpp, $(wildcard *.cpp))
 HDRS = $(wildcard *.h)
-OBJS = $(patsubst %.c,./build/%.o,$(SRCS))
+OBJS = $(patsubst %.cpp,./build/%.o,$(SRCS))
 INCLUDES = -I../include/
 DEFINES = $(REDUCER_DEF) $(ABI_DEF) $(ALERT_DEF)
 OPTIONS = $(OPT) $(DBG) $(ARCH) -Werror -Wall -fpic $(DEFINES) $(INCLUDES) -gdwarf-4
@@ -30,7 +30,7 @@ $(MAIN).a: $(OBJS)
 	$(AR) rcs $@ $^
 
 $(MAIN).so: $(OBJS)
-	$(CC) -shared -o $@ $^
+	$(CXX) -shared -o $@ $^
 
 $(PERSON_C).a: build/$(PERSON_C_SRC).o
 	$(AR) rcs $@ $^
@@ -48,22 +48,22 @@ $(PEDIGREE_LIB).a: build/$(PEDIGREE_LIB_SRC).o
 	$(AR) rcs $@ $^
 
 $(PEDIGREE_LIB).so: ./build/$(PEDIGREE_LIB_SRC).o
-	$(CC) -shared -o $@ $^
+	$(CXX) -shared -o $@ $^
 
 build:
 	mkdir -p $@
 
 $(RTS_LIBDIR):
 	mkdir -p $@
 
-build/%.o: %.c $(HDRS)
-	$(CC) -c $(OPTIONS) -o $@ $<
-
 build/%.o: %.cpp $(HDRS)
 	$(CXX) -c $(OPTIONS) -o $@ $<
 
-build/cilk2c_inlined.bc: cilk2c_inlined.c $(HDRS)
-	$(CC) $(OPT) -DCHEETAH_API="" -DCHEETAH_INTERNAL_NORETURN='__attribute__((noreturn))' -DCHEETAH_INTERNAL="" -DCILK_DEBUG=0 -c -emit-llvm $(INCLUDES) -gdwarf-4 -g -o $@ $<
+build/%.o: %.c $(HDRS)
+	$(CC) -c $(OPTIONS) -o $@ $<
+
+build/cilk2c_inlined.bc: cilk2c_inlined.cpp $(HDRS)
+	$(CXX) $(OPT) -DCHEETAH_API_CONSUMER -DCILK_DEBUG=0 -c -emit-llvm $(INCLUDES) -gdwarf-4 -g -o $@ $<
 
 $(BITCODE_ABI) : build/cilk2c_inlined.bc
 	cp $< $@