Merge pull request #2408 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger
sstsimulator · Oct 11, 2024 · 80bd5b1 · 80bd5b1
2 parents 7e9c2fa + 37c64f6
commit 80bd5b1
Show file tree

Hide file tree

Showing 21 changed files with 393 additions and 115 deletions.
diff --git a/src/sst/elements/ember/Makefile.am b/src/sst/elements/ember/Makefile.am
@@ -299,6 +299,7 @@ EXTRA_DIST = \
 	test/generateNidListInterval.py \
 	test/generateNidListRandom.py \
 	tests/testsuite_default_ember_nightly.py \
+	tests/testsuite_default_ember_otf2.py \
 	tests/testsuite_default_ember_sweep.py \
 	tests/testsuite_default_ember_qos.py \
 	tests/testsuite_default_ember_ESshmem.py \
@@ -310,9 +311,20 @@ EXTRA_DIST = \
 	tests/refFiles/ESshmem_cumulative.out \
 	tests/refFiles/test_EmberSweep.out \
 	tests/refFiles/test_embernightly.out \
+	tests/refFiles/test_emberotf2.out \
 	tests/refFiles/test_qos-dragonfly.out \
 	tests/refFiles/test_qos-fattree.out \
-	tests/refFiles/test_qos-hyperx.out
+	tests/refFiles/test_qos-hyperx.out \
+	tests/addFiles/test_emberotf2/traces.otf2 \
+	tests/addFiles/test_emberotf2/traces.def \
+	tests/addFiles/test_emberotf2/traces/0.def \
+	tests/addFiles/test_emberotf2/traces/0.evt \
+	tests/addFiles/test_emberotf2/traces/1.def \
+	tests/addFiles/test_emberotf2/traces/1.evt \
+	tests/addFiles/test_emberotf2/traces/2.def \
+	tests/addFiles/test_emberotf2/traces/2.evt \
+	tests/addFiles/test_emberotf2/traces/3.def \
+	tests/addFiles/test_emberotf2/traces/3.evt
 
 if USE_EMBER_CONTEXTS
 libember_la_SOURCES += \
@@ -327,7 +339,7 @@ libember_la_SOURCES += \
 
 libember_la_LIBADD = \
 	$(OTF2_LDFLAGS) \
-	$(OTF2_LIBS)
+	$(OTF2_LIBS) \
 	-lotf2
 endif