Skip to content

SST Master Branch Merger: Auto Create Pull Request to Promote from devel to master - All Tests Ran Clean #2204

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

Merged
sst-autotester merged 7 commits into from
Aug 17, 2023
Merged

SST Master Branch Merger: Auto Create Pull Request to Promote from devel to master - All Tests Ran Clean #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd9220c
Samba --> samba
hughes-c Aug 16, 2023
b6d8f08
Silly r
hughes-c Aug 16, 2023
fea59cf
Ooof
hughes-c Aug 16, 2023
c634734
Opal --> opal
hughes-c Aug 16, 2023
7cd36f6
Merge Pull Request #2199 from hughes-c/sst-elements/hughes/naming-2
sst-autotester Aug 16, 2023
da204b3
Merge branch 'sstsimulator:master' into hughes/naming-3
hughes-c Aug 16, 2023
b5f1be8
Merge Pull Request #2202 from hughes-c/sst-elements/hughes/naming-3
sst-autotester Aug 16, 2023
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
6 changes: 0 additions & 6 deletions src/sst/elements/Opal/configure.m4
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions src/sst/elements/Opal/Makefile.am → src/sst/elements/opal/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ comp_LTLIBRARIES = libOpal.la
libOpal_la_SOURCES = \
mempool.h \
mempool.cc \
Opal.cc \
Opal.h \
Opal_Event.h \
opal.cc \
opal.h \
opal_event.h \
arielmemmgr_opal.cc \
arielmemmgr_opal.h \
opalMemNIC.cc \
opalMemNIC.h \
PageFaultHandler.cc \
PageFaultHandler.h
page_fault_handler.cc \
page_fault_handler.h

libOpal_la_LDFLAGS = \
-avoid-version
Expand Down
0 src/sst/elements/Opal/README → src/sst/elements/opal/README
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/sst/elements/Opal/arielmemmgr_opal.cc → src/sst/elements/opal/arielmemmgr_opal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include <sst_config.h>
#include "arielmemmgr_opal.h"
#include "Opal_Event.h"
#include "opal_event.h"

#include <sst/core/link.h>

Expand Down
0 src/sst/elements/Opal/arielmemmgr_opal.h → src/sst/elements/opal/arielmemmgr_opal.h
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions src/sst/elements/opal/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dnl -*- Autoconf -*-

AC_DEFUN([SST_opal_CONFIG], [
sst_opal_comp_happy="yes"
AS_IF([test "x$sst_opal_comp_happy" = "xyes"], [$1], [$2])
])
8 changes: 0 additions & 8 deletions src/sst/elements/Opal/mempool.cc → src/sst/elements/opal/mempool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@
// distribution.
//


/* Author: Amro Awad
* E-mail: amro.awad@ucf.edu
*/
/* Author: Vamsee Reddy Kommareddy
* E-mail: vamseereddy@knights.ucf.edu
*/

#include <sst_config.h>

#include "mempool.h"
Expand Down
10 changes: 1 addition & 9 deletions src/sst/elements/Opal/mempool.h → src/sst/elements/opal/mempool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,7 @@
// distribution.
//


/* Author: Amro Awad
* E-mail: amro.awad@ucf.edu
*/
/* Author: Vamsee Reddy Kommareddy
* E-mail: vamseereddy@knights.ucf.edu
*/

#include "Opal_Event.h"
#include "opal_event.h"

#include <list>
#include <map>
Expand Down
12 changes: 1 addition & 11 deletions src/sst/elements/Opal/Opal.cc → src/sst/elements/opal/opal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,8 @@
// distribution.
//


//
/* Author: Amro Awad
* E-mail: aawad@sandia.gov
*/
/* Author: Vamsee Reddy Kommareddy
* E-mail: vamseereddy@knights.ucf.edu
*/


#include <sst_config.h>
#include "Opal.h"
#include "opal.h"

#include <string>
#include <iostream>
Expand Down
10 changes: 1 addition & 9 deletions src/sst/elements/Opal/Opal.h → src/sst/elements/opal/opal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@
// distribution.
//


/* Author: Amro Awad
* E-mail: amro.awad@ucf.edu
*/
/* Author: Vamsee Reddy Kommareddy
* E-mail: vamseereddy@knights.ucf.edu
*/

#include <cstring>
#include <string>
#include <fstream>
Expand All @@ -37,7 +29,7 @@
#include <sst/core/interfaces/simpleMem.h>
#include <sst/core/output.h>

#include "Opal_Event.h"
#include "opal_event.h"
#include "mempool.h"

using namespace SST;
Expand Down
0 src/sst/elements/Opal/opalMemNIC.cc → src/sst/elements/opal/opalMemNIC.cc
View file
Open in desktop
File renamed without changes.
0 src/sst/elements/Opal/opalMemNIC.h → src/sst/elements/opal/opalMemNIC.h
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions src/sst/elements/Opal/Opal_Event.h → src/sst/elements/opal/opal_event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@
// distribution.
//


//
/* Author: Amro Awad
* E-mail: aawad@sandia.gov
*/
/* Author: Vamsee Reddy Kommareddy
* E-mail: vamseereddy@knights.ucf.edu
*/

#ifndef _H_SST_OPAL_EVENT
#define _H_SST_OPAL_EVENT

Expand Down
4 changes: 2 additions & 2 deletions src/sst/elements/Opal/PageFaultHandler.cc → src/sst/elements/opal/page_fault_handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include <sst_config.h>

#include "PageFaultHandler.h"
#include "Opal_Event.h"
#include "page_fault_handler.h"
#include "opal_event.h"

#include <sst/core/link.h>

Expand Down
2 changes: 1 addition & 1 deletion src/sst/elements/Opal/PageFaultHandler.h → src/sst/elements/opal/page_fault_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <sst/core/component.h>
#include <sst/core/output.h>

#include "sst/elements/Samba/PageFaultHandler.h"
#include "sst/elements/samba/page_fault_handler.h"

#include <stdint.h>
#include <deque>
Expand Down
0 src/sst/elements/Opal/tests/app/makefile → src/sst/elements/opal/tests/app/makefile
View file
Open in desktop
File renamed without changes.
0 src/sst/elements/Opal/tests/app/opal_mlm.c → src/sst/elements/opal/tests/app/opal_mlm.c
View file
Open in desktop
File renamed without changes.
0 src/sst/elements/Opal/tests/app/opal_test.c → src/sst/elements/opal/tests/app/opal_test.c
View file
Open in desktop
File renamed without changes.
0 ...t/elements/Opal/tests/basic_1node_1smp.py → ...t/elements/opal/tests/basic_1node_1smp.py
View file
Open in desktop
File renamed without changes.
0 ...t/elements/Opal/tests/basic_2node_1smp.py → ...t/elements/opal/tests/basic_2node_1smp.py
View file
Open in desktop
File renamed without changes.
0 ...s/refFiles/test_Opal_basic_1node_1smp.out → ...s/refFiles/test_Opal_basic_1node_1smp.out
View file
Open in desktop
File renamed without changes.
0 ...s/refFiles/test_Opal_basic_2node_1smp.out → ...s/refFiles/test_Opal_basic_2node_1smp.out
View file
Open in desktop
File renamed without changes.
26 changes: 13 additions & 13 deletions src/sst/elements/Samba/Makefile.am → src/sst/elements/samba/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ comp_LTLIBRARIES = libSamba.la
libSamba_la_SOURCES = \
libSamba.cc \
utils.h \
Samba_Event.h \
Samba.cc \
Samba.h \
TLBUnit.cc \
TLBUnit.h \
TLBentry.h \
TLBhierarchy.h \
TLBhierarchy.cc \
PageTableWalker.h \
PageTableWalker.cc \
PageFaultHandler.h \
SimpleTLB.cc \
SimpleTLB.h
samba_event.h \
samba.cc \
samba.h \
tlb_unit.cc \
tlb_unit.h \
tlb_entry.h \
tlb_hierarchy.h \
tlb_hierarchy.cc \
page_table_walker.h \
page_table_walker.cc \
page_fault_handler.h \
simple_tlb.cc \
simple_tlb.h

libSamba_la_LDFLAGS = \
-lm \
Expand Down
0 src/sst/elements/Samba/README → src/sst/elements/samba/README
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/sst/elements/Samba/configure.m4 → src/sst/elements/samba/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dnl -*- Autoconf -*-

AC_DEFUN([SST_Samba_CONFIG], [
AC_DEFUN([SST_samba_CONFIG], [
sst_samba_comp_happy="yes"
AS_IF([test "x$sst_samba_comp_happy" = "xyes"], [$1], [$2])
])
10 changes: 3 additions & 7 deletions src/sst/elements/Samba/libSamba.cc → src/sst/elements/samba/libSamba.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,14 @@
// information, see the LICENSE file in the top level directory of the
// distribution.

/* Author: Amro Awad
* E-mail: aawad@sandia.gov
*/


#include <sst_config.h>

#include "sst/core/component.h"

#include "Samba.h"
#include "TLBhierarchy.h"
#include<iostream>
#include "samba.h"
#include "tlb_hierarchy.h"
#include <iostream>

using namespace SST;
using namespace SST::SambaComponent;
Expand Down
5 changes: 0 additions & 5 deletions src/sst/elements/Samba/PageFaultHandler.h → src/sst/elements/samba/page_fault_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
// information, see the LICENSE file in the top level directory of the
// distribution.

/* Author: Vamsee Reddy Kommareddy
* E-mail: vamseereddy8@knights.ucf.edu
*/


#ifndef _H_SAMBA_PAGE_FAULT_HANDLER
#define _H_SAMBA_PAGE_FAULT_HANDLER

Expand Down
10 changes: 3 additions & 7 deletions src/sst/elements/Samba/PageTableWalker.cc → src/sst/elements/samba/page_table_walker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@
// distribution.
//

/* Author: Amro Awad
* E-mail: aawad@sandia.gov
*/

#include <sst_config.h>
#include "PageTableWalker.h"
#include "page_table_walker.h"
#include <sst/core/link.h>
#include "Samba_Event.h"
#include<iostream>
#include "samba_event.h"
#include <iostream>

using namespace SST::SambaComponent;
using namespace SST::MemHierarchy;
Expand Down
11 changes: 3 additions & 8 deletions src/sst/elements/Samba/PageTableWalker.h → src/sst/elements/samba/page_table_walker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
// distribution.
//

/* Author: Amro Awad
* E-mail: aawad@sandia.gov
*/


#ifndef _H_SST_PTW
#define _H_SST_PTW

Expand All @@ -25,12 +20,12 @@
#include <sst/core/interfaces/simpleMem.h>
#include <sst/core/link.h>
#include <sst/core/event.h>
#include<map>
#include<vector>
#include <map>
#include <vector>
#include <sst/core/sst_types.h>

#include "utils.h"
#include "PageFaultHandler.h"
#include "page_fault_handler.h"

// This file defines the page table walker and

Expand Down
7 changes: 1 addition & 6 deletions src/sst/elements/Samba/Samba.cc → src/sst/elements/samba/samba.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,10 @@
// distribution.
//

/* Author: Amro Awad
* E-mail: aawad@sandia.gov
*/



#include <sst_config.h>
#include <string>
#include "Samba.h"
#include "samba.h"


using namespace SST::Interfaces;
Expand Down
13 changes: 3 additions & 10 deletions src/sst/elements/Samba/Samba.h → src/sst/elements/samba/samba.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
// distribution.


/* Author: Amro Awad
* E-mail: aawad@sandia.gov
*/



#include <sst/core/sst_types.h>
#include <sst/core/event.h>
#include <sst/core/component.h>
Expand All @@ -35,12 +29,11 @@
#include <stdint.h>
#include <poll.h>

#include "TLBhierarchy.h"
#include "PageTableWalker.h"
#include "PageFaultHandler.h"
#include "tlb_hierarchy.h"
#include "page_table_walker.h"
#include "page_fault_handler.h"
#include <sst/elements/memHierarchy/memEventBase.h>

//#include "arielcore.h"

using namespace std;

Expand Down
0 src/sst/elements/Samba/Samba_Event.h → src/sst/elements/samba/samba_event.h
View file
Open in desktop
File renamed without changes.
11 changes: 1 addition & 10 deletions src/sst/elements/Samba/SimpleTLB.cc → src/sst/elements/samba/simple_tlb.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,18 @@
// distribution.
//

/* Author: Janet Vorobyeva
* E-mail: jvoroby@sandia.gov
*/



#include <sst_config.h>
#include "SimpleTLB.h"
#include "simple_tlb.h"

//#include <string>

using namespace SST::Interfaces;
using namespace SST;
using namespace SST::SambaComponent;

#include <sst/elements/memHierarchy/memEventBase.h>
#include <sst/elements/memHierarchy/memEvent.h>
using SST::MemHierarchy::MemEventBase;
using SST::MemHierarchy::MemEvent;
using SST::MemHierarchy::Addr;
#include <sst/elements/memHierarchy/util.h>


// VERBOSITIES (using definitions from memHierarchy/util.h
Expand Down
0 src/sst/elements/Samba/SimpleTLB.h → src/sst/elements/samba/simple_tlb.h
View file
Open in desktop
File renamed without changes.
0 src/sst/elements/Samba/tests/gupsgen_mmu.py → src/sst/elements/samba/tests/gupsgen_mmu.py
View file
Open in desktop
File renamed without changes.
0 ...t/elements/Samba/tests/gupsgen_mmu_4KB.py → ...t/elements/samba/tests/gupsgen_mmu_4KB.py
View file
Open in desktop
File renamed without changes.
0 .../elements/Samba/tests/gupsgen_mmu_opal.py → .../elements/samba/tests/gupsgen_mmu_opal.py
View file
Open in desktop
File renamed without changes.
0 ...s/Samba/tests/gupsgen_mmu_three_levels.py → ...s/samba/tests/gupsgen_mmu_three_levels.py
View file
Open in desktop
File renamed without changes.
0 ...tests/refFiles/test_Samba_gupsgen_mmu.out → ...tests/refFiles/test_Samba_gupsgen_mmu.out
View file
Open in desktop
File renamed without changes.
0 ...s/refFiles/test_Samba_gupsgen_mmu_4KB.out → ...s/refFiles/test_Samba_gupsgen_mmu_4KB.out
View file
Open in desktop
File renamed without changes.
0 ...s/test_Samba_gupsgen_mmu_three_levels.out → ...s/test_Samba_gupsgen_mmu_three_levels.out
View file
Open in desktop
File renamed without changes.
0 ...efFiles/test_Samba_stencil3dbench_mmu.out → ...efFiles/test_Samba_stencil3dbench_mmu.out
View file
Open in desktop
File renamed without changes.
0 ...s/refFiles/test_Samba_streambench_mmu.out → ...s/refFiles/test_Samba_streambench_mmu.out
View file
Open in desktop
File renamed without changes.
0 ...st/elements/Samba/tests/simpletlb_test.py → ...st/elements/samba/tests/simpletlb_test.py
View file
Open in desktop
File renamed without changes.
0 ...lements/Samba/tests/stencil3dbench_mmu.py → ...lements/samba/tests/stencil3dbench_mmu.py
View file
Open in desktop
File renamed without changes.
0 ...t/elements/Samba/tests/streambench_mmu.py → ...t/elements/samba/tests/streambench_mmu.py
View file
Open in desktop
File renamed without changes.
0 ...ts/Samba/tests/testsuite_default_Samba.py → ...ts/samba/tests/testsuite_default_Samba.py
View file
Open in desktop
File renamed without changes.
0 src/sst/elements/Samba/TLBentry.h → src/sst/elements/samba/tlb_entry.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/sst/elements/Samba/TLBhierarchy.cc → src/sst/elements/samba/tlb_hierarchy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <sst_config.h>

#include "TLBhierarchy.h"
#include "tlb_hierarchy.h"

#include <sst/core/event.h>
#include <sst/core/sst_types.h>
Expand Down
17 changes: 6 additions & 11 deletions src/sst/elements/Samba/TLBhierarchy.h → src/sst/elements/samba/tlb_hierarchy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
// distribution.
//

/* Author: Amro Awad
* E-mail: aawad@sandia.gov
*/



#ifndef _H_SST_TLBSTRUCTURE
#define _H_SST_TLBSTRUCTURE
Expand All @@ -27,15 +22,15 @@
#include <sst/core/output.h>
#include <sst/core/interfaces/simpleMem.h>

#include<string>
#include <string>

#include "utils.h"
#include "TLBentry.h"
#include "TLBUnit.h"
#include "PageTableWalker.h"
#include "tlb_entry.h"
#include "tlb_unit.h"
#include "page_table_walker.h"

#include<map>
#include<vector>
#include <map>
#include <vector>


// This is going to define the Samba/TLB Hierarchy for each core
Expand Down
Loading