Merge pull request #1 from mohanmithur/MS4_Changes

Ms4 changes
ROCm · Oct 30, 2021 · 08aff27 · 08aff27
2 parents aaa6d95 + a886b7c
commit 08aff27
Show file tree

Hide file tree

Showing 123 changed files with 7,897 additions and 894 deletions.
diff --git a/cfg.py b/cfg.py
@@ -20,7 +20,7 @@
 
 version = "1.0.0"
 
-user_password = "AH64_uh1"
+user_password = None
 log_location = None
 
 # None/amd/nvidia
@@ -32,6 +32,9 @@
 # None/0/1/2/4
 HIPCC_VERBOSE = None
 
+# None/0/1
+CONFORMANCE_VERBOSE = None
+
 # None/cuda directory
 CUDA_PATH = None
 
@@ -74,12 +77,7 @@
     "hip": {
         "repo_url": "https://github.com/ROCm-Developer-Tools/HIP",
         "branch": None,
-        "commit_id": "586165ebc281eb9461898a5b2abbc74595f5d97d"
-    },
-    "hipamd": {
-        "repo_url": "https://github.com/ROCm-Developer-Tools/HIPAMD",
-        "branch": None,
-        "commit_id": "de01ce04677243116dba52b59406a130517ea4c7"
+        "commit_id": "96ee9d1397f02ac4b4badd9243994728f6a89fe5"
     },
     "mixbench": {
         "repo_url": "https://github.com/ekondis/mixbench.git",
@@ -91,14 +89,49 @@
         "branch": None,
         "commit_id": "6fe81e19556ac26761a1c7247ae29fa88fb4e0ab"
     },
-    "rocclr": {
-        "repo_url": "https://github.com/ROCm-Developer-Tools/ROCclr",
+    "mgbench": {
+        "repo_url": "https://github.com/tbennun/mgbench.git",
+        "branch": None,
+        "commit_id": "6f12d3848020af8f718074a30c68e6f0b232bfb3"
+    },
+    "cuda_grep": {
+        "repo_url": "https://github.com/bkase/CUDA-grep.git",
+        "branch": None,
+        "commit_id": "fa6630eb0c3e782620ec3eaf989873dadc9a036b"
+    },
+    "cuda_memtest": {
+        "repo_url": "https://github.com/ComputationalRadiationPhysics/cuda_memtest.git",
+        "branch": None,
+        "commit_id": "0cd3a996ce82682fcf50fa6f433b6f1f2ce1353d"
+    },
+    "quicksilver": {
+        "repo_url": "https://github.com/LLNL/Quicksilver.git",
+        "branch": "AMD-HIP",
+        "commit_id": "bf073887bf73ef34de8025adaba51c6ad7fb15be"
+    },
+    "gridtools": {
+        "repo_url": "https://github.com/GridTools/gridtools.git",
+        "branch": None,
+        "commit_id": "d33fa6fecee0a7bd9e080212c1038f0dbd31fe97"
+    },
+    "gtbench": {
+        "repo_url": "https://github.com/GridTools/gtbench.git",
+        "branch": None,
+        "commit_id": "42687cce5085e0e175cb02fefe87fbb3d952fd5c"
+    },
+    "kokkos": {
+        "repo_url": "https://github.com/kokkos/kokkos.git",
+        "branch": None,
+        "commit_id": "c28a8b03288b185f846ddfb1b7c08213e12e2634"
+    },
+    "mfem": {
+        "repo_url": "https://github.com/mfem/mfem.git ./mfem",
         "branch": None,
-        "commit_id": "0ca4f7939969004b9080d814a30cc8e34cdac833"
+        "commit_id": "a3f0a5bb7ca874ec260d6f85afa3693cd6542497"
     },
-    "opencl": {
-        "repo_url": "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime",
+    "Laghos": {
+        "repo_url": "https://github.com/CEED/Laghos.git",
         "branch": None,
-        "commit_id": "bbdc87e08b322d349f82bdd7575c8ce94d31d276"
+        "commit_id": "a7f6123d42847f6bdbdb614f5af876541f49cd16"
     }
 }
diff --git a/cleanPrj.sh b/cleanPrj.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This shell script removes all generated files/folders and cloned repositories
+echo "Cleaning hip-testsuite project.."
+find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
+rm -Rf report
+rm -Rf src/hiptestsuite/applications/cuda_grep/CUDA-grep
+rm -Rf src/hiptestsuite/applications/cuda_memtest/cuda_memtest
+rm -Rf src/hiptestsuite/applications/hip_examples/GPU-STREAM
+rm -Rf src/hiptestsuite/applications/hip_examples/HIP-Examples
+rm -Rf src/hiptestsuite/applications/hip_examples/mixbench
+rm -Rf src/hiptestsuite/applications/mgbench/mgbench
+rm -Rf src/hiptestsuite/applications/hpc_apps/gridtools/boost_1_72_0
+rm -Rf src/hiptestsuite/applications/hpc_apps/gridtools/GridTools
+rm -Rf src/hiptestsuite/applications/hpc_apps/gridtools/gridtools
+rm -Rf src/hiptestsuite/applications/hpc_apps/kokkos/kokkos
+rm -Rf src/hiptestsuite/applications/hpc_apps/laghos/hypre*
+rm -Rf src/hiptestsuite/applications/hpc_apps/laghos/Laghos
+rm -Rf src/hiptestsuite/applications/hpc_apps/laghos/metis*
+rm -Rf src/hiptestsuite/applications/hpc_apps/laghos/mfem
+rm -Rf src/hiptestsuite/applications/hpc_apps/quicksilver/Quicksilver
+rm -Rf src/hiptestsuite/conformance/HIP
diff --git a/examples/examples/0.py b/examples/examples/0.py
@@ -20,8 +20,8 @@
 
 from pathlib import Path
 
-from amd.TesterRepository import Tester
-from amd.Test import TestData, TestResult
+from hiptestsuite.TesterRepository import Tester
+from hiptestsuite.Test import TestData, TestResult
 
 
 class Test0(Tester):

diff --git a/examples/examples/1.py b/examples/examples/1.py
@@ -18,9 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from amd.TesterRepository import Tester
-from amd.Test import TestData, TestResult, Test
-from amd.test_classifier import TestClassifier
+from hiptestsuite.TesterRepository import Tester
+from hiptestsuite.Test import TestData, TestResult, Test
+from hiptestsuite.test_classifier import TestClassifier
 
 from typing import List, Union
 

diff --git a/examples/examples/2.py b/examples/examples/2.py
@@ -18,9 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from amd.TesterRepository import Tester
-from amd.Test import TestData, TestResult, Test
-from amd.test_classifier import TestClassifier
+from hiptestsuite.TesterRepository import Tester
+from hiptestsuite.Test import TestData, TestResult, Test
+from hiptestsuite.test_classifier import TestClassifier
 
 from typing import List, Union
 

diff --git a/examples/examples/3.py b/examples/examples/3.py
@@ -18,9 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from amd.TesterRepository import Tester
-from amd.Test import HIPTestData, TestResult, Test
-from amd.test_classifier import TestClassifier
+from hiptestsuite.TesterRepository import Tester
+from hiptestsuite.Test import HIPTestData, TestResult, Test
+from hiptestsuite.test_classifier import TestClassifier
 
 from typing import List, Union
 

diff --git a/examples/examples/4.py b/examples/examples/4.py
@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from amd.TesterRepository import Tester
-from amd.Test import TestResult, TestData, LogLocation, UserAccess
+from hiptestsuite.TesterRepository import Tester
+from hiptestsuite.Test import TestResult, TestData, LogLocation, UserAccess
 
 
 class MyTestData(TestData, LogLocation, UserAccess):

diff --git a/examples/run.py b/examples/run.py
@@ -26,9 +26,9 @@
     sys.path.append(os.path.join(os.path.dirname(__file__), "..", "src"))
 
 
-from amd.TestersExecutor import TestersExecutor
-from amd.TesterRepository import TesterRepository
-from amd.list_tests import list_tests
+from hiptestsuite.TestersExecutor import TestersExecutor
+from hiptestsuite.TesterRepository import TesterRepository
+from hiptestsuite.list_tests import list_tests
 import cfg
 import examples
 

diff --git a/run.py b/run.py
@@ -26,8 +26,8 @@
     sys.path.append(os.path.join(os.path.dirname(__file__), "src"))
 
 
-from amd.TestersExecutor import TestersExecutor
-from amd.list_tests import list_tests
+from hiptestsuite.TestersExecutor import TestersExecutor
+from hiptestsuite.list_tests import list_tests
 import cfg
 
 
@@ -61,10 +61,13 @@ def parse_args():
 
 
 def main():
+    # Exclude tests from thirdparty folder
+    exclude_module_paths = ["hiptestsuite/thirdparty"]
+
     if parse_args():
         tester_executor: TestersExecutor = TestersExecutor()
         tester_executor.config = cfg
-        tester_executor.executeTests()
+        tester_executor.executeTests(exclude_module_paths=exclude_module_paths)
 
 
 if __name__ == "__main__":

diff --git a/src/amd/applications/hip_samples/hip_samples_build.py b/src/amd/applications/hip_samples/hip_samples_build.py