Improved DLL tests.

stevencpp · stevencpp · commit b5b785d6cf5b · 2018-11-30T21:53:35.000+02:00
diff --git a/build_rules/Xt_Build_Instances.cs b/build_rules/Xt_Build_Instances.cs
@@ -158,6 +158,8 @@ List<string> FindInstFiles() {
 			// by construction guid_to_node should only contain projects that
 			// the root project references or depends on transitively
 			foreach(Node node in guid_to_node.Values) {
+				//TODO: each project should just write the list of .xti files to a cache file
+				//so we don't have to reconstruct it from the header cache file here
 				string[] props = {"Xt_InstFilePath_FromHeader", "Xt_InstFilePath", "Xt_HeaderCachePath", "Xt_InstSuffix"};
 				string[] values = props.Select(prop => node.project.GetPropertyValue(prop)).ToArray();
 				if(values.Any(value => value == "")) continue;
diff --git a/src/xt_inst_gen/xt_comp.cpp b/src/xt_inst_gen/xt_comp.cpp
@@ -175,7 +175,7 @@ int find_exported_templates(
 		return true;
 	});
 
-	fmt::print("finished parsing\n");
+	//fmt::print("finished parsing\n");
 	return 0;
 }
 
diff --git a/src/xt_inst_gen/xt_inst_file.h b/src/xt_inst_gen/xt_inst_file.h
@@ -251,7 +251,7 @@ struct xt_inst_file_reader_writer
 			it = it_end + 1;
 		}
 
-		if (version != xt_inst_file::current_version) {
+		if (!ret.contents.empty() && version != xt_inst_file::current_version) {
 			fmt::print("note: version mismatch, ignoring file contents\n");
 			ret = {};
 		}
diff --git a/src/xt_inst_gen/xt_link.cpp b/src/xt_inst_gen/xt_link.cpp
@@ -416,6 +416,7 @@ int do_link(int argc, const char *argv[]) {
 
 			for (auto exported_symbol : inst_file.get_exported_symbols()) {
 				bool got_one = false;
+				// todo: use a trie or binary search or something to speed up the prefix search
 				remove_if_and_erase(remaining_unresolved_names, [&](auto & p) {
 					if (string_starts_with(p.to_match, exported_symbol.get_name())) {
 						std::string_view to_inst = p.to_inst;
diff --git a/test/dll/CMakeLists.txt b/test/dll/CMakeLists.txt
@@ -3,45 +3,55 @@ project(test_dll LANGUAGES CXX)
 
 find_package(export_template REQUIRED)
 
+# == A ==
 add_executable(A
 	A_main.cpp
 	B_loader.cpp
 )
+add_dependencies(A B) # don't link with B
+target_link_libraries(A C D)
 
-# TODO:
-# B is meant to be loaded at runtime by A so
-# A should not link with B but B should build before A
-# so in VS, B should be a dependency of A but should not be referenced by it
-target_link_libraries(A B C D)
-
+# == B ==
 add_library(B SHARED
 	B.cpp
 	B.h
 )
-
 target_compile_definitions(B
 	PRIVATE B_DLL_EXPORT
 )
+target_link_libraries(B C)
+
+# == C ==
+add_library(C STATIC
+	C.cpp
+	C.h
+)
 
+# == D ==
 add_library(D SHARED
 	D.cpp
 	D.h
 )
-
 target_compile_definitions(D 
 	PRIVATE D_DLL_EXPORT
 	INTERFACE D_DLL_IMPORT
 )
-
-target_link_libraries(B C)
-
-add_library(C STATIC
-	C.cpp
-	C.h
+target_link_libraries(D E)
+
+# == E ==
+add_library(E SHARED
+	E.cpp
+	E.h
+	E1.cpp
+	E1.h
+)
+target_compile_definitions(E
+	PRIVATE E_DLL_EXPORT
+	INTERFACE E_DLL_IMPORT
 )
 
-set_property(TARGET A B C PROPERTY CXX_STANDARD 17)
+set_property(TARGET A B C D E PROPERTY CXX_STANDARD 17)
 
-target_export_template(A B C D)
+target_export_template(A B C D E)
 
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT A)
diff --git a/test/dll/D.cpp b/test/dll/D.cpp
@@ -1,6 +1,8 @@
 #include "D.h"
 #include <D.xti>
 
+#include "E.h"
+
 #include <stdio.h>
 
 namespace D {
@@ -32,12 +34,15 @@ namespace D {
 	void D1<T>::D4<U>::foo() {
 		printf("%s\n", __FUNCSIG__);
 	}
+
+	__declspec(dllexport) void exported_function() {
+		E::foo<int>();
+	}
 	
 	template<typename T>
 	void D2::foo() {
 		printf("%s\n", __FUNCSIG__);
+		exported_function();
 	}
-	
-	__declspec(dllexport) void dummy_func() {}
 
 } // namespace D
diff --git a/test/dll/E.cpp b/test/dll/E.cpp
@@ -0,0 +1,20 @@
+#include "E.h"
+#include <E.xti>
+
+#include "E1.h"
+
+#include <stdio.h>
+
+namespace E {
+
+	__declspec(dllexport) void exported_function() {
+		E1::foo<bool>();
+	}
+
+	template <typename T>
+	void foo() {
+		printf("%s\n", __FUNCSIG__);
+		exported_function();
+	}
+
+} // namespace E
diff --git a/test/dll/E.h b/test/dll/E.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#if defined(E_DLL_EXPORT)
+#define E_DLL_SPEC __declspec(dllexport)
+#elif defined(E_DLL_IMPORT)
+#define E_DLL_SPEC __declspec(dllimport)
+#else
+#define E_DLL_SPEC
+#endif
+
+#pragma warning (push)
+#pragma warning (disable:5030)
+namespace E
+{
+	template <typename T>
+	[[export_template]] E_DLL_SPEC void foo();
+} // namespace E
+#pragma warning (pop)
+
+#undef E_DLL_SPEC
diff --git a/test/dll/E1.cpp b/test/dll/E1.cpp
@@ -0,0 +1,14 @@
+#include "E1.h"
+#include <E1.xti>
+
+#include <stdio.h>
+
+namespace E1
+{
+	
+	template <typename T>
+	void foo() {
+		printf("%s\n", __FUNCSIG__);
+	}
+	
+} // namespace E1
diff --git a/test/dll/E1.h b/test/dll/E1.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#pragma warning (push)
+#pragma warning (disable:5030)
+namespace E1
+{
+	
+	template<typename T>
+	[[export_template]] void foo();
+	
+} // namespace E1
+#pragma warning (pop)
diff --git a/test/test_all.bat b/test/test_all.bat
@@ -2,7 +2,7 @@
 set current_path=%cd%
 set mypath=%~dp0
 
-for %%T in (cuda diamond dll ping_pong) do (
+for %%T in (ping_pong diamond cuda dll) do (
 	call full_clean_one.bat %%T
 	call run_one.bat %%T
 	if not exist %mypath%\%%T\build\Debug\A.exe (

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ int find_exported_templates(`
`175`	`175`	`return true;`
`176`	`176`	`});`
`177`	`177`
`178`		`- fmt::print("finished parsing\n");`
	`178`	`+ //fmt::print("finished parsing\n");`
`179`	`179`	`return 0;`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ struct xt_inst_file_reader_writer`
`251`	`251`	`it = it_end + 1;`
`252`	`252`	`}`
`253`	`253`
`254`		`- if (version != xt_inst_file::current_version) {`
	`254`	`+ if (!ret.contents.empty() && version != xt_inst_file::current_version) {`
`255`	`255`	`fmt::print("note: version mismatch, ignoring file contents\n");`
`256`	`256`	`ret = {};`
`257`	`257`	`}`