Skip to content

Adding reversion of some files. #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: WorkingBranch
Choose a base branch
from
Open

Adding reversion of some files. #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f243f4
adding reversion
Jul 2, 2024
34f1cb2
adding reversion
Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
EXPENDABLES_WINDOWS = bin/MainContextj.o bin/ASTHelper.o bin/SymbolTableBuilder.o bin/SymbolTableNew.o bin/y.tab.o bin/lex.yy.o parser/y.tab.c parser/lex.yy.c bin/deviceVarsAnalyser.o bin/analyserUtil.o bin/dv*.o bin/bv*.o
EXPENDABLES = bin/MainContext.o bin/ASTHelper.o bin/SymbolTableBuilder.o bin/SymbolTableNew.o bin/y.tab.o bin/lex.yy.o parser/y.tab.c parser/lex.yy.c bin/deviceVarsAnalyser.o bin/blockVarsAnalyser.o
EXPENDABLES = bin/MainContext.o bin/ASTHelper.o bin/SymbolTableBuilder.o bin/SymbolTableNew.o bin/y.tab.o bin/lex.yy.o parser/y.tab.c parser/lex.yy.c bin/deviceVarsAnalyser.o bin/blockVarsAnalyser.o bin/liveVarsAnalyser.o bin/liveVarsNode.o bin/getUsed.o
ANALYSER = bin/dataRaceAnalyser.o
PROGRAMS = bin/MainContext.o bin/ASTHelper.o bin/SymbolTableBuilder.o bin/SymbolTableNew.o bin/y.tab.o bin/lex.yy.o bin/cu_dsl_cpp_generator.o bin/ac_dsl_cpp_generator.o bin/om_dsl_cpp_generator.o bin/mpi_dsl_cpp_generator.o bin/om_dyn_dsl_cpp_generator.o bin/mpi_dsl_cpp_generator_helper.o bin/mpi_dsl_cpp_expression_generator.o bin/mpi_dsl_cpp_statement_generator.o bin/mpi_dsl_dyn_cpp_generator.o bin/sycl_dsl_cpp_generator.o bin/multigpu_dsl_cpp_generator.o bin/amd_dsl_cpp_generator.o bin/bAnalyzer.o
#bin/ac_dsl_cpp_generator.o
#bin/om_dsl_cpp_generator.o
A_PROGRAM = bin/attachPropAnalyser.o bin/dataRaceAnalyser.o bin/deviceVarsAnalyser.o bin/blockVarsAnalyser.o bin/analyserUtil.o bin/pushpullAnalyser.o
A_PROGRAM = bin/attachPropAnalyser.o bin/dataRaceAnalyser.o bin/deviceVarsAnalyser.o bin/blockVarsAnalyser.o bin/analyserUtil.o bin/pushpullAnalyser.o bin/liveVarsAnalyser.o bin/liveVarsNode.o bin/getUsed.o

CFLAGS = -g
CC = g++ -std=c++11 #-Wall # -Wno-unused-variable #-fsanitize=address
Expand All @@ -23,6 +23,20 @@ all: starplat
#~ starplat_cuda: bin/MainContext.o bin/ASTHelper.o bin/SymbolTableBuilder.o bin/SymbolTableNew.o bin/y.tab.o bin/lex.yy.o $(A_PROGRAM)
#~ $(CC) bin/MainContext.o bin/ASTHelper.o bin/SymbolTableBuilder.o bin/SymbolTableNew.o bin/y.tab.o bin/lex.yy.o bin/dsl_cpp_generator.o $(A_PROGRAM) -o starplat

#hip
HIP_PROGRAMS = bin/hip_dsl_cpp_generator.o bin/hip_auxillary.o bin/hip_code_gen.o bin/hip_get_used.o

bin/hip_dsl_cpp_generator.o: backends/backend_hip/dsl_cpp_generator.cpp backends/dslCodePad.h backends/backend_hip/auxillary_functions.cpp
$(CC) $(CFLAGS) -c backends/backend_hip/dsl_cpp_generator.cpp -o bin/hip_dsl_cpp_generator.o

bin/hip_auxillary.o: backends/backend_hip/auxillary_functions.cpp backends/dslCodePad.h
$(CC) $(CFLAGS) -c backends/backend_hip/auxillary_functions.cpp -o bin/hip_auxillary.o

bin/hip_code_gen.o: backends/backend_hip/hip_gen_functions.cpp backends/dslCodePad.h
$(CC) $(CFLAGS) -c backends/backend_hip/hip_gen_functions.cpp -o bin/hip_code_gen.o

bin/hip_get_used.o: backends/backend_hip/get_used_data.cpp backends/dslCodePad.h
$(CC) $(CFLAGS) -c backends/backend_hip/get_used_data.cpp -o bin/hip_get_used.o

#amd
bin/amd_dsl_cpp_generator.o: backends/backend_amd/dsl_cpp_generator.cpp backends/dslCodePad.h
Expand Down Expand Up @@ -66,6 +80,8 @@ bin/bAnalyzer.o : backends/backend_mpi/bAnalyzer/bAnalyzer.h backends/backend_mp
$(CC) $(CFLAGS) -c backends/backend_mpi/bAnalyzer/bAnalyzer.cc -o bin/bAnalyzer.o

#sycl


bin/sycl_dsl_cpp_generator.o: backends/backend_sycl/dsl_cpp_generator.cpp backends/dslCodePad.h
$(CC) $(CFLAGS) -c backends/backend_sycl/dsl_cpp_generator.cpp -o bin/sycl_dsl_cpp_generator.o

Expand Down Expand Up @@ -147,9 +163,18 @@ bin/bv5.o: analyser/blockVars/setVarsInParallel.cpp analyser/blockVars/blockVars
bin/bv6.o.o: analyser/blockVars/analyserUtil.cpp analyser/blockVars/analyserUtil.h
$(CC) $(CFLAGS) -c analyser/blockVars/analyserUtil.cpp -o bin/bv6.o.o

bin/analyserUtil.o: analyser/analyserUtil.cpp
bin/analyserUtil.o: analyser/analyserUtil.cpp analyser/analyserUtil.h ast/ASTNodeTypes.hpp
$(CC) $(CFLAGS) -c analyser/analyserUtil.cpp -o bin/analyserUtil.o

bin/liveVarsNode.o: analyser/liveVars/liveVarsNode.cpp analyser/liveVars/liveVarsNode.h
$(CC) $(CFLAGS) -c analyser/liveVars/liveVarsNode.cpp -o bin/liveVarsNode.o

bin/liveVarsAnalyser.o: analyser/liveVars/liveVarsAnalyser.cpp analyser/liveVars/liveVarsAnalyser.h
$(CC) $(CFLAGS) -c analyser/liveVars/liveVarsAnalyser.cpp -o bin/liveVarsAnalyser.o

bin/getUsed.o: analyser/liveVars/getUsed.cpp analyser/liveVars/liveVarsAnalyser.h
$(CC) $(CFLAGS) -c analyser/liveVars/getUsed.cpp -o bin/getUsed.o

#bin/dsl_cpp_generator.o: backends/backend_mpi/mpi_cpp_generator.cpp backends/dslCodePad.h
# $(CC) -c backends/backend_mpi/mpi_cpp_generator.cpp -o bin/dsl_cpp_generator.o

Expand All @@ -169,3 +194,31 @@ clean:
#~ rm -f $(EXPENDABLES)
rm bin/*.o StarPlat
rmdir bin

# HIP SPECIFIC TARGETS

define generate_hip_code
@./StarPlat -s -f ../graphcode/staticDSLCodes/$(1) -b hip > /dev/null 2>&1 && echo "\033[0;32m$(2) success for $(1)\033[0m" || echo "\033[0;31m$(2) failed for $(1)\033[0m"
endef

define compile_hip_code
@hipcc ../graphcode/generated_hip/$(1) -c > /dev/null 2>&1 && echo -e "\033[0;32mCompile success for $(1)\033[0m" || echo -e "\033[0;31mCompile failed for $(1)\033[0m"
endef

define check_hipcc_installation
@which hipcc > /dev/null 2>&1 || (echo "\033[0;31mhipcc is not installed. Please install hipcc to proceed.\033[0m" && exit 1)
endef


compile-hip: generate-hip
$(call check_hipcc_installation)
$(call compile_hip_code,sssp_dslV3.cc)
$(call compile_hip_code,triangle_counting_dsl.cc)
$(call compile_hip_code,bc_dslV2.cc)
$(call compile_hip_code,PageRankDSLV3.cc)

generate-hip: all
$(call generate_hip_code,PageRankDSLV3,CodeGeneration)
$(call generate_hip_code,bc_dslV2,CodeGeneration)
$(call generate_hip_code,sssp_dslV3,CodeGeneration)
$(call generate_hip_code,triangle_counting_dsl,CodeGeneration)
8 changes: 8 additions & 0 deletions src/analyser/Grammar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ statement: declaration ';'
|control_flow
|reduction ';'
| bfs_abstraction
| bfs_reverse_abstraction
| bfs_abstraction2
| blockstatements
| unary_expr ';'

Expand Down Expand Up @@ -152,9 +154,15 @@ arg_list :
bfs_abstraction : T_BFS '(' id T_IN id '.' proc_call T_FROM id ')' filterExpr blockstatements reverse_abstraction
| T_BFS '(' id T_IN id '.' proc_call T_FROM id ')' filterExpr blockstatements

bfs_abstraction2 : T_BFS2 '(' id T_IN id '.' proc_call T_FROM id ')' filterExpr blockstatements reverse_abstraction
| T_BFS2 '(' id T_IN id '.' proc_call T_FROM id ')' filterExpr blockstatements


reverse_abstraction : T_REVERSE blockstatements
| T_REVERSE '(' boolean_expr ')' blockstatements

bfs_reverse_abstraction : T_BFSREVERSE '(' id T_IN id '.' proc_call T_FROM id ')' filterExpr blockstatements

oid : id '.' id

tid : id '.' id '.' id
Expand Down
Loading