WIP: merge master

fixed removeDvmSpfDirectives
2025-03-25 21:53:01 +03:00 · 2025-03-25 13:14:14 +03:00 · 2025-03-25 12:28:21 +03:00 · 2025-03-23 15:15:00 +03:00 · 2025-03-19 20:35:57 +03:00 · 2025-03-19 20:31:19 +03:00
1 changed files with 1 additions and 14 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,8 +197,7 @@ set(TRANSFORMS
        ${TR_PRIV_DEL}
        ${TR_IMPLICIT_NONE}
        ${TR_REPLACE_ARRAYS_IN_IO})
-        
-<<<<<<< HEAD
+
 set(CFG _src/CFGraph/IR.cpp
        _src/CFGraph/IR.h
        _src/CFGraph/CFGraph.cpp
@@ -211,18 +210,6 @@ set(CFG _src/CFGraph/IR.cpp
        _src/CFGraph/private_variables_analysis.h
 	_src/CFGraph/IRSSAForm.cpp
 	_src/CFGraph/IRSSAForm.h
-=======
-set(CFG src/CFGraph/IR.cpp
-        src/CFGraph/IR.h
-        src/CFGraph/CFGraph.cpp
-        src/CFGraph/CFGraph.h
-        src/CFGraph/RD_subst.cpp
-        src/CFGraph/RD_subst.h
-        src/CFGraph/live_variable_analysis.cpp
-        src/CFGraph/live_variable_analysis.h
-        src/CFGraph/private_variables_analysis.cpp
-        src/CFGraph/private_variables_analysis.h
->>>>>>> 18f5619 (fixed paths)
        )
        
 set(DATA_FLOW
Author	SHA1	Message	Date
Dudarenko	cd209a587a	WIP: merge master	2025-03-25 21:53:01 +03:00
ALEXks	381e3c5355	fixed removeDvmSpfDirectives	2025-03-25 13:14:14 +03:00
ALEXks	7eef52eb90	fixed removeDvmSpfDirectives	2025-03-25 12:28:21 +03:00
ALEXks	6235d11eb7	fixed module analysis	2025-03-23 15:15:00 +03:00
ALEXks	ddec450845	fixed	2025-03-19 20:35:57 +03:00
ALEXks	024b9581c9	fixed module symbols analysis	2025-03-19 20:31:19 +03:00
ALEXks	d58227bd0c	added REMOVE_SPF pass	2025-03-18 09:37:20 +03:00
ALEXks	43dfc2368a	version updated	2025-03-15 13:05:15 +03:00
Alexander_KS	9b12eb20c8	Обновить README.md	2025-03-13 15:14:12 +00:00
Alexander_KS	bacdc170bc	Обновить README.md	2025-03-13 13:31:02 +00:00
Alexander	bb174e6f72	added forgotten files	2025-03-13 16:26:16 +03:00
Alexander	ca05420451	moved dvm to submodule	2025-03-13 12:48:07 +03:00
Alexander	d0488339d0	added dvm as submodule	2025-03-13 12:17:20 +03:00
ALEXks	d0c7d0ba34	added Server project	2025-03-13 10:07:58 +03:00
Alexander	eb39eb4b19	fixed cmakes	2025-03-13 09:52:03 +03:00
Alexander	7a51067b7a	moved to dvm_svn	2025-03-13 09:28:27 +03:00
Alexander	033bbce220	finalyze moving	2025-03-12 14:28:04 +03:00
Alexander	f840006398	fixed paths	2025-03-12 14:24:50 +03:00
Alexander	18f561925b	fixed paths	2025-03-12 14:22:11 +03:00
Alexander	a4c8785e66	removed unnecessary	2025-03-12 14:12:44 +03:00
Alexander	684d391bff	fixed paths	2025-03-12 14:11:06 +03:00
Alexander	24210c8bfb	fixed paths	2025-03-12 12:45:22 +03:00
Alexander	6a4040be3e	moved	2025-03-12 12:37:19 +03:00
ALEXks	1c851baa7e	added module symbols initiazliation	2025-03-11 15:24:36 +03:00
ALEXks	817a910a4b	version updated	2025-03-06 20:13:06 +03:00
ALEXks	ab294fbeb2	fdvm updated	2025-03-06 20:07:20 +03:00
ALEXks	0b594f7c2a	fixed module analysis	2025-03-05 12:31:01 +03:00
ALEXks	c58755df2b	first step of shadow fixing	2025-02-20 19:52:32 +03:00
ALEXks	7b12fb1bb0	improved module analysis	2025-02-18 18:57:05 +03:00
ALEXks	6b0eaab96d	improved module analysis	2025-02-18 13:45:20 +03:00
ALEXks	83a303cc30	fixed implicit	2025-02-13 16:37:24 +03:00
ALEXks	7e17c62bbb	refactoring module analysis	2025-02-10 17:16:15 +03:00
ALEXks	f135cd6d06	fixed module symbol analysis	2025-02-10 13:13:01 +03:00
ALEXks	1504504d96	fixed function analysis	2025-02-10 12:16:52 +03:00
ALEXks	d8aa5606ef	fixed dead flag for functions	2025-02-09 20:48:06 +03:00
ALEXks	c5d063b0da	fixed distribution, fixed routine, fixed null program unparsing	2025-01-29 10:08:13 +03:00
ALEXks	ab7b617e76	added optimized version of CG on GPU	2025-01-28 10:09:35 +03:00
ALEXks	a14bc20cf4	removed logging from SAPFOR and SERVER, updated NPB and fdvm	2025-01-28 10:09:10 +03:00
ALEXks	8879eb2fbf	updated dvm	2025-01-24 17:33:55 +03:00
ALEXks	3c924aee73	fixed DECLARE	2025-01-15 15:23:49 +03:00
ALEXks	15535fad2a	fixed DECLARE	2025-01-13 18:16:11 +03:00
ALEXks	95cfb4446b	fixed	2025-01-12 17:48:08 +03:00
ALEXks	fe7345aab0	added dvm declare	2025-01-12 17:46:37 +03:00
ALEXks	631a73ddc0	fixed routine convertation	2025-01-12 15:58:18 +03:00
ALEXks	b0df33e926	improved ROUTINE insertion	2025-01-11 09:32:17 +03:00