diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1371,6 +1371,61 @@
                         ],
                     )},
 
+# OpenMP AMDGPU Builders
+    {'name' : "openmp-offload-amdgpu-project",
+    'tags'  : ["openmp"],
+    'workernames' : ["omp-vega20-0"],
+    'builddir': "openmp-offload-amdgpu-project",
+    'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
+                        clean=False,
+                        enable_runtimes=[],
+                        extraCmakeArgs=[
+                            "-DCMAKE_INSTALL_PREFIX=/home/ompworker/trunk_1.0",
+                            "-DCMAKE_BUILD_TYPE=Release",
+                            "-DLLVM_ENABLE_PROJECTS=clang;lld",
+                            "-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU",
+                            "-DLLVM_ENABLE_ASSERTIONS=ON",
+                            "-DLLVM_CCACHE_BUILD=$OPTION_CCACHE",
+                            "-DCLANG_DEFAULT_LINKER=lld",
+                            '-DLLVM_PARALLEL_LINK_JOBS=2',
+                            ],
+                        install=True,
+                        testsuite=True,
+                        testsuite_sollvevv=True,
+                        extraTestsuiteCmakeArgs=[
+                            "-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
+                            "-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
+                        ],
+                    )},
+
+    {'name' : "openmp-offload-amdgpu-runtime",
+    'tags'  : ["openmp"],
+    'workernames' : ["omp-vega20-0"],
+    'builddir': "openmp-offload-amdgpu-runtime",
+    'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
+                        clean=False,
+                        enable_runtimes=['openmp'],
+                        extraCmakeArgs=[
+                            "-DCMAKE_INSTALL_PREFIX=/home/ompworker/trunk_1.0",
+                            "-DCMAKE_BUILD_TYPE=Release",
+                            "-DLLVM_ENABLE_PROJECTS=clang;lld",
+                            "-DLLVM_TARGETS_TO_BUILD=X86;AMDGPU",
+                            "-DLLVM_ENABLE_ASSERTIONS=ON",
+                            "-DLLVM_CCACHE_BUILD=$OPTION_CCACHE",
+                            "-DCLANG_DEFAULT_LINKER=lld",
+                            "-DLLVM_ENABLE_RUNTIMES=openmp" \
+                            '-DLLVM_PARALLEL_LINK_JOBS=2',
+                            ],
+                        install=True,
+                        testsuite=True,
+                        testsuite_sollvevv=True,
+                        extraTestsuiteCmakeArgs=[
+                            "-DTEST_SUITE_SOLLVEVV_OFFLOADING_CFLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
+                            "-DTEST_SUITE_SOLLVEVV_OFFLOADING_LDLAGS=-fopenmp-targets=amdgcn-amd-amdhsa;-Xopenmp-target=amdgcn-amd-amdhsa",
+                        ],
+                    )},
+
+
 # Libc++ builders.
 
     {'name' : 'libcxx-libcxxabi-libunwind-ppc-aix',
diff --git a/buildbot/osuosl/master/config/status.py b/buildbot/osuosl/master/config/status.py
--- a/buildbot/osuosl/master/config/status.py
+++ b/buildbot/osuosl/master/config/status.py
@@ -265,6 +265,14 @@
         subject = "Build Failure: %(builder)s",
         mode = "failing",
         builders = ["arc-builder"]),
+    # SALINAS
+    reporters.MailNotifier(
+        fromaddr="llvm.buildmaster@lab.llvm.org",
+        sendToInterestedUsers = False,
+        extraRecipients=["dl.gcr.lightning.buildbot@amd.com"],
+        subject = "Build Failure: %(builder)s",
+        mode = "failing",
+        builders = ["omp-vega20"]),
 ]
 
 
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -253,4 +253,8 @@
 
         # ARC Worker, CentOS 7.9 x86_64 Intel Xeon Platinum 8000 @ 3.6GHz, 32GB RAM
         create_worker("arc-worker", properties={'jobs': 16}, max_builds=1),
+
+        # SALINAS
+        # OpenMP on AMDGPU, Ubuntu 18.04.5, Intel(R) Xeon(R) Gold 5218 @ 2.30GHz, Vega20 GPU
+        create_worker("omp-vega20-0", max_builds=1),
         ]