Thread local storage: Update unit tests for thread local storage

Test cases now support TLS tests for:
- intra translation unit (already existed)
- inter translation unit, within the same module
- inter module
- trivial and non trivial constructors
- both orders of declaration and usage

Change-Id: I71681b00525bfe3e7906541e0b5b4c21a8556beb
RTC:147599
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72633
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

11 files changed, 804 insertions, 0 deletions

diff --git a/src/usr/testcore/tlsmod/makefile b/src/usr/testcore/tlsmod/makefile
new file mode 100644
index 000000000..5e01aae5d
--- /dev/null
+++ b/src/usr/testcore/tlsmod/makefile
@@ -0,0 +1,38 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/testcore/tlsmod/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2011,2019
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+ROOTPATH = ../../../..
+
+MODULE = testtlsmod
+
+TESTS += tlsmod.H
+TESTS += tlsfile.H
+TESTS += nontrivial.H
+TESTS += trivial.H
+
+OBJS += tlsfile.o
+OBJS += nontrivial.o
+OBJS += trivial.o
+OBJS += tlsmod.o
+include ${ROOTPATH}/config.mk
diff --git a/src/usr/testcore/tlsmod/nontrivial.C b/src/usr/testcore/tlsmod/nontrivial.C
new file mode 100644
index 000000000..58398d678
--- /dev/null
+++ b/src/usr/testcore/tlsmod/nontrivial.C
@@ -0,0 +1,31 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/nontrivial.C $                        */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#include "nontrivialctor.H"
+
+namespace __tls_test
+{
+    thread_local NonTrivialCtor tls_nontrivial;
+};
diff --git a/src/usr/testcore/tlsmod/nontrivial.H b/src/usr/testcore/tlsmod/nontrivial.H
new file mode 100644
index 000000000..82dfe3980
--- /dev/null
+++ b/src/usr/testcore/tlsmod/nontrivial.H
@@ -0,0 +1,103 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/nontrivial.H $                        */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __TLSMOD_NONTRIVIAL_H
+#define __TLSMOD_NONTRIVIAL_H
+
+#include <cxxtest/TestSuite.H>
+#include <sys/task.h>
+#include "nontrivialctor.H"
+#include <string.h>
+
+namespace __tls_test
+{
+
+    // @note: See src/usr/testcore/lib/tls.H for API definition
+    void spawnTasks(
+        const char* const i_pFnName,
+              void*(*i_pFn)(void*));
+
+    extern thread_local NonTrivialCtor tls_nontrivial;
+
+    /**
+     *  @brief Test which validates a non-trivial TLS variable
+     */
+    void* test_tls_nontrivial(void* unused)
+    {
+        TS_INFO(ENTER_MRK "test_tls_nontrivial");
+
+        do {
+
+        char* const thebytes = tls_nontrivial.c_str();
+
+        if(strcmp(thebytes,NonTrivialCtor::INIT_VALUE)!=0)
+        {
+            TS_FAIL("test_tls_nontrivial: bad initial value; "
+                    "expected %s but got %s",
+                    NonTrivialCtor::INIT_VALUE, thebytes);
+            break;
+        }
+
+        task_yield();
+
+        thebytes[0]++;
+
+        task_yield();
+
+        if(strcmp(thebytes,NonTrivialCtor::POST_VALUE)!=0)
+        {
+            TS_FAIL("test_tls_nontrivial: bad post value; "
+                    "expected %s but got %s",
+                    NonTrivialCtor::POST_VALUE, thebytes);
+            break;
+        }
+
+        } while(0);
+
+        TS_INFO(EXIT_MRK "test_tls_nontrivial");
+
+        return nullptr;
+    }
+
+}; // End __tls_test namespace
+
+// Test TLS for non trivial constructors
+class LibcTlsTestNonTrivial : public CxxTest::TestSuite
+{
+  public:
+
+    /**
+     *  @brief Tests a non-trivial constructor TLS variable
+     */
+    void testTlsNonTrivial()
+    {
+        TS_INFO(ENTER_MRK "testTlsNonTrivial");
+        __tls_test::spawnTasks("testTlsNonTrivial",
+                               __tls_test::test_tls_nontrivial);
+        TS_INFO(EXIT_MRK "testTlsNonTrivial");
+    }
+};
+
+#endif // End __TLSMOD_NONTRIVIAL_H
diff --git a/src/usr/testcore/tlsmod/nontrivialctor.H b/src/usr/testcore/tlsmod/nontrivialctor.H
new file mode 100644
index 000000000..c051c8900
--- /dev/null
+++ b/src/usr/testcore/tlsmod/nontrivialctor.H
@@ -0,0 +1,81 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/nontrivialctor.H $                    */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __TLSMOD_NONTRIVIALCTOR_H
+#define __TLSMOD_NONTRIVIALCTOR_H
+
+#include <string.h>
+
+namespace __tls_test
+{
+
+class NonTrivialCtor
+{
+    char* bytes;
+
+  public:
+
+    static constexpr const char* const INIT_VALUE = "0123456789ABCDE";
+    static constexpr const char* const POST_VALUE = "1123456789ABCDE";
+    static constexpr const size_t NULL_SIZE = 1;
+
+    /**
+     *  @brief Build an object that allocates heap memory
+     */
+    NonTrivialCtor()
+    {
+        bytes = new char[strlen(INIT_VALUE)+NULL_SIZE]();
+        strcpy(bytes,INIT_VALUE);
+    }
+
+    /**
+     *  @brief Return the object's string storage, allowing updates to it
+     *
+     *  @return char* Pointer to the internal string
+     */
+    char* c_str() const
+    {
+        return bytes;
+    }
+
+    /**
+     *  @brief Destructor
+     */
+    ~NonTrivialCtor()
+    {
+        delete bytes;
+        bytes = nullptr;
+    }
+
+    // Delete the copy/assignment (and move equivalents) constructors/operators
+    NonTrivialCtor(const NonTrivialCtor&) = delete;
+    NonTrivialCtor& operator=(const NonTrivialCtor&) = delete;
+    NonTrivialCtor(NonTrivialCtor&&) = delete;
+    NonTrivialCtor& operator=(NonTrivialCtor&&) = delete;
+};
+
+}; // End __tls_test namespace
+
+#endif // __TLSMOD_NONTRIVIALCTOR_H
diff --git a/src/usr/testcore/tlsmod/tlsfile.C b/src/usr/testcore/tlsmod/tlsfile.C
new file mode 100644
index 000000000..68d20aa5e
--- /dev/null
+++ b/src/usr/testcore/tlsmod/tlsfile.C
@@ -0,0 +1,36 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/tlsfile.C $                           */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#include <cxxtest/TestSuite.H>
+#include <sys/task.h>
+
+namespace __tls_test
+{
+    extern constexpr size_t INTERFILE_INIT_VALUE = 0xabcd1234;
+    extern constexpr size_t INTERFILE_POST_VALUE = 0xabcd1235;
+
+    thread_local size_t tls_interfile = 0xabcd1234;
+};
+
diff --git a/src/usr/testcore/tlsmod/tlsfile.H b/src/usr/testcore/tlsmod/tlsfile.H
new file mode 100644
index 000000000..37102aacc
--- /dev/null
+++ b/src/usr/testcore/tlsmod/tlsfile.H
@@ -0,0 +1,105 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/tlsfile.H $                           */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __TLSMOD_TLSFILE_H
+#define __TLSMOD_TLSFILE_H
+
+#include <cxxtest/TestSuite.H>
+#include <sys/task.h>
+
+namespace __tls_test
+{
+
+// @note: see src/usr/testcore/lib/tls.H for API definition
+void spawnTasks(
+     const char* const i_pFnName,
+           void*(*i_pFn)(void*));
+
+extern size_t INTERFILE_INIT_VALUE;
+extern size_t INTERFILE_POST_VALUE;
+
+extern thread_local size_t tls_interfile;
+
+/**
+ *  @brief Test a TLS variable defined in a different file
+ */
+void* test_tls_interfile(void* unused)
+{
+    TS_INFO(ENTER_MRK "test_tls_interfile");
+
+    do {
+
+    decltype(tls_interfile) rc = tls_interfile;
+    if(rc != INTERFILE_INIT_VALUE)
+    {
+        TS_FAIL("test_tls_interfile: bad initial value; "
+                "expected 0x%016llX but got 0x%016llX",
+                INTERFILE_INIT_VALUE,rc);
+        break;
+    }
+
+    task_yield();
+
+    tls_interfile++;
+
+    task_yield();
+
+    rc = tls_interfile;
+    if(rc != INTERFILE_POST_VALUE)
+    {
+        TS_FAIL("test_tls_interfile: bad post value; "
+                "expected 0x%016llX but got 0x%016llX",
+                INTERFILE_POST_VALUE,rc);
+        break;
+    }
+
+    } while(0);
+
+    TS_INFO(EXIT_MRK "test_tls_interfile");
+
+    return nullptr;
+}
+
+}; // End __tls_test namespace
+
+// Test TLS between translation units (i.e. between files)
+class LibcTlsTestFile : public CxxTest::TestSuite
+{
+  public:
+
+    /**
+     *  @brief Test as bunch of TLS vars in a different file
+     */
+    void testTlsInterfile()
+    {
+        TS_INFO(ENTER_MRK "testTlsInterfile");
+        __tls_test::spawnTasks("testTlsInterfile",
+                               __tls_test::test_tls_interfile);
+        TS_INFO(EXIT_MRK "testTlsInterfile");
+    }
+
+};
+
+#endif // End __TLSMOD_TLSFILE_H
diff --git a/src/usr/testcore/tlsmod/tlsmod.C b/src/usr/testcore/tlsmod/tlsmod.C
new file mode 100644
index 000000000..8010cac44
--- /dev/null
+++ b/src/usr/testcore/tlsmod/tlsmod.C
@@ -0,0 +1,31 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/tlsmod.C $                            */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#include "nontrivialctor.H"
+
+namespace __tls_test
+{
+    thread_local NonTrivialCtor foobar_object;
+};
diff --git a/src/usr/testcore/tlsmod/tlsmod.H b/src/usr/testcore/tlsmod/tlsmod.H
new file mode 100644
index 000000000..a9ee3efef
--- /dev/null
+++ b/src/usr/testcore/tlsmod/tlsmod.H
@@ -0,0 +1,172 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/tlsmod.H $                            */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __TLSMOD_TLSMOD_H
+#define __TLSMOD_TLSMOD_H
+
+#include <cxxtest/TestSuite.H>
+#include <sys/task.h>
+#include "nontrivialctor.H"
+
+namespace __tls_test
+{
+
+// @note: See src/usr/testcore/lib/tls.H for API definition
+void spawnTasks(
+    const char* const i_pFnName,
+          void*(*i_pFn)(void*));
+
+extern const size_t FOOBAR_INIT_VALUE;
+extern const size_t FOOBAR_POST_VALUE;
+
+extern thread_local size_t foobar;
+
+extern thread_local NonTrivialCtor foobar_object;
+
+size_t foobarInitValue();
+
+size_t foobarPostValue();
+
+void test_tls_call_other_module_producer();
+
+void test_tls_call_other_module_consumer();
+
+/***
+ *  @brief Test to consume a TLS var from a different library
+ */
+void* test_tls_module_cons(void* unused)
+{
+    TS_INFO(ENTER_MRK "test_tls_module_cons");
+
+    do {
+
+    decltype(foobar) rc = foobar;
+    if(rc != foobarInitValue())
+    {
+        TS_FAIL("test_tls_module_cons: bad initial value; "
+                "expected 0x%016llX but got 0x%016llX",
+                foobarInitValue(),rc);
+        break;
+    }
+
+    task_yield();
+
+    foobar++;
+
+    task_yield();
+
+    rc = foobar;
+    if(rc != foobarPostValue())
+    {
+        TS_FAIL("test_tls_module_cons: bad post value; "
+                "expected 0x%016llX but got 0x%016llX",
+                foobarPostValue(),rc);
+        break;
+    }
+
+    } while(0);
+
+    TS_INFO(EXIT_MRK "test_tls_module_cons");
+
+    return nullptr;
+}
+
+/***
+ *  @brief Test to consume a TLS var from same library
+ */
+void* test_tls_module_prod(void* unused)
+{
+    TS_INFO(ENTER_MRK "test_tls_module_prod");
+
+    do {
+
+    char* const thebytes = foobar_object.c_str();
+
+    if(strcmp(thebytes,NonTrivialCtor::INIT_VALUE)!=0)
+    {
+        TS_FAIL("test_tls_module_prod: bad initial value; "
+                "expected %s but got %s", foobar_object.INIT_VALUE, thebytes);
+        break;
+    }
+
+    task_yield();
+
+    thebytes[0]++;
+
+    task_yield();
+
+    if(strcmp(thebytes,NonTrivialCtor::POST_VALUE)!=0)
+    {
+        TS_FAIL("test_tls_module_prod: bad post value; "
+                "expected %s but got %s", foobar_object.POST_VALUE, thebytes);
+        break;
+    }
+
+    } while(0);
+
+    TS_INFO(EXIT_MRK "test_tls_module_prod");
+
+    return nullptr;
+}
+
+}; // End __tls_test namespace
+
+// Test TLS between modules
+class LibcTlsTestMod : public CxxTest::TestSuite
+{
+  public:
+
+    /**
+     *  @brief Test TLS var where local library accesses a var in another
+     *      library, then call into that other library where it will access
+     *      that same var locally.
+     */
+    void testTlsConsumerFirst()
+    {
+        TS_INFO(ENTER_MRK "testTlsConsumerFirst");
+        __tls_test::spawnTasks("testTlsConsumerFirst",
+                               __tls_test::test_tls_module_cons);
+        TS_INFO(EXIT_MRK "testTlsConsumerFirst");
+
+        __tls_test::test_tls_call_other_module_producer();
+    }
+
+    /**
+     *  @brief Test TLS var where the var is accessed from the local library,
+     *      then call into a different library and have it access the same var
+     *      from this library.
+     */
+    void testTlsProducerFirst()
+    {
+        TS_INFO(ENTER_MRK "testTlsProducerFirst");
+        __tls_test::spawnTasks("testTlsProducerFirst",
+                               __tls_test::test_tls_module_prod);
+        TS_INFO(EXIT_MRK "testTlsProducerFirst");
+
+        __tls_test::test_tls_call_other_module_consumer();
+    }
+};
+
+#endif // End __TLSMOD_TLSMOD_H
diff --git a/src/usr/testcore/tlsmod/trivial.C b/src/usr/testcore/tlsmod/trivial.C
new file mode 100644
index 000000000..57fb8dc7b
--- /dev/null
+++ b/src/usr/testcore/tlsmod/trivial.C
@@ -0,0 +1,31 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/trivial.C $                           */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#include "trivialctor.H"
+
+namespace __tls_test
+{
+    thread_local TrivialCtor tls_trivial;
+};
diff --git a/src/usr/testcore/tlsmod/trivial.H b/src/usr/testcore/tlsmod/trivial.H
new file mode 100644
index 000000000..b3f9b2586
--- /dev/null
+++ b/src/usr/testcore/tlsmod/trivial.H
@@ -0,0 +1,97 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/trivial.H $                           */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __TLSMOD_TRIVIAL_H
+#define __TLSMOD_TRIVIAL_H
+
+#include <cxxtest/TestSuite.H>
+#include <sys/task.h>
+#include "trivialctor.H"
+#include <string.h>
+
+namespace __tls_test
+{
+    extern thread_local TrivialCtor tls_trivial;
+
+    /**
+     *  @brief Test a thread local trivial constructor
+     */
+    void* test_tls_trivial(void* unused)
+    {
+        TS_INFO(ENTER_MRK "test_tls_trivial");
+
+        do {
+
+        size_t value = tls_trivial.getValue();
+
+        if(TrivialCtor::TRIVIAL_CTOR_INIT_VALUE != value)
+        {
+            TS_FAIL("test_tls_trivial: bad initial value; "
+                    "expected 0x%016llX but got 0x%016llX",
+                    TrivialCtor::TRIVIAL_CTOR_INIT_VALUE,value);
+            break;
+        }
+
+        task_yield();
+
+        tls_trivial.setValue(++value);
+        value = 0;
+
+        task_yield();
+
+        value = tls_trivial.getValue();
+
+        if(TrivialCtor::TRIVIAL_CTOR_POST_VALUE != value)
+        {
+            TS_FAIL("test_tls_trivial: bad post value; "
+                    "expected 0x%016llX but got 0x%016llX",
+                    TrivialCtor::TRIVIAL_CTOR_POST_VALUE,value);
+            break;
+        }
+
+        } while(0);
+
+        TS_INFO(EXIT_MRK "test_tls_trivial");
+
+        return nullptr;
+    }
+};
+
+// Test TLS for trivial constructors
+class LibcTlsTestTrivial : public CxxTest::TestSuite
+{
+  public:
+
+    /**
+     *  @brief Test TLS trivial constructors
+     */
+    void testTlsTrivial()
+    {
+        TS_INFO(ENTER_MRK "testTlsTrivial");
+        __tls_test::spawnTasks("testTlsTrivial",__tls_test::test_tls_trivial);
+        TS_INFO(EXIT_MRK "testTlsTrivial");
+    }
+};
+#endif
diff --git a/src/usr/testcore/tlsmod/trivialctor.H b/src/usr/testcore/tlsmod/trivialctor.H
new file mode 100644
index 000000000..77d3a22b2
--- /dev/null
+++ b/src/usr/testcore/tlsmod/trivialctor.H
@@ -0,0 +1,79 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/testcore/tlsmod/trivialctor.H $                       */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2019                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __TLSMOD_TRIVIALCTOR_H
+#define __TLSMOD_TRIVIALCTOR_H
+
+#include <stdint.h>
+
+namespace __tls_test
+{
+
+// @note: src/usr/testcore/lib/tls.H for interface
+void spawnTasks(
+        const char* const i_pFnName,
+              void*(*i_pFn)(void*));
+
+class TrivialCtor
+{
+    size_t value;
+
+  public:
+
+    static constexpr const size_t TRIVIAL_CTOR_INIT_VALUE = 0xBADDEED5;
+    static constexpr const size_t TRIVIAL_CTOR_POST_VALUE = 0xBADDEED6;
+
+    /**
+     *  @brief Constructor; establishes initial value
+     */
+    TrivialCtor()
+      : value(TRIVIAL_CTOR_INIT_VALUE)
+    {
+    }
+
+    /**
+     *  @brief Return internal value
+     *
+     *  @return size_t Internal value
+     */
+    size_t getValue() const
+    {
+        return value;
+    }
+
+    /**
+     *  @brief Set internal value
+     *
+     *  @param[in] i_val Value to set
+     */
+    void setValue(const size_t i_val)
+    {
+        value = i_val;
+    }
+};
+
+}; // End __tls_test namespace
+
+#endif // __TLSMOD_TRIVIALCTOR_H