From f2490685ecfdca09eac52a703de934f66b0c93eb Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Fri, 19 Jun 2020 16:28:13 -0500 Subject: [PATCH] Update licensing and remove duplicate licenses. Change-Id: I0aab6f310d96bf6c5a918e7a9c03713a00dc5c4a [ROCm/ROCR-Runtime commit: e9a4eff8a133e8e981c085326cd32bb45872b3b2] --- .../hsa-runtime/core/inc/amd_elf_image.hpp | 39 ---------- .../hsa-runtime/core/inc/amd_hsa_code.hpp | 39 ---------- .../hsa-runtime/core/util/win/os_win.cpp | 75 +++++++++--------- .../hsa-runtime/inc/hsa_ven_amd_aqlprofile.h | 78 +++++++++---------- 4 files changed, 74 insertions(+), 157 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_elf_image.hpp b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_elf_image.hpp index 34bf943224..593cae13cb 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_elf_image.hpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_elf_image.hpp @@ -40,45 +40,6 @@ // //////////////////////////////////////////////////////////////////////////////// -/****************************************************************************** -* University of Illinois / NCSA -* Open Source License -* -* Copyright(c) 2011 - 2015 Advanced Micro Devices, Inc. -* All rights reserved. -* -* Developed by: -* Advanced Micro Devices, Inc. -* www.amd.com -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files(the "Software"), to deal -* with the Software without restriction, including without limitation the -* rights to use, copy, modify, merge, publish, distribute, sublicense, and / -* or sell copies of the Software, and to permit persons to whom the Software -* is furnished to do so, subject to the following conditions: -* -* Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimers. -* -* Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimers in the documentation -* and / or other materials provided with the distribution. -* -* Neither the names of Advanced Micro Devices, Inc, nor the -mes of its -* contributors may be used to endorse or promote products derived from this -* Software without specific prior written permission. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE -* CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -* THE SOFTWARE. -******************************************************************************/ - #ifndef AMD_ELF_IMAGE_HPP_ #define AMD_ELF_IMAGE_HPP_ diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_code.hpp b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_code.hpp index 3bd4b7acac..0cda7490f3 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_code.hpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_hsa_code.hpp @@ -40,45 +40,6 @@ // //////////////////////////////////////////////////////////////////////////////// -/****************************************************************************** -* University of Illinois / NCSA -* Open Source License -* -* Copyright(c) 2011 - 2015 Advanced Micro Devices, Inc. -* All rights reserved. -* -* Developed by: -* Advanced Micro Devices, Inc. -* www.amd.com -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files(the "Software"), to deal -* with the Software without restriction, including without limitation the -* rights to use, copy, modify, merge, publish, distribute, sublicense, and / -* or sell copies of the Software, and to permit persons to whom the Software -* is furnished to do so, subject to the following conditions: -* -* Redistributions of source code must retain the above copyright notice, -* this list of conditions and the following disclaimers. -* -* Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimers in the documentation -* and / or other materials provided with the distribution. -* -* Neither the names of Advanced Micro Devices, Inc, nor the -mes of its -* contributors may be used to endorse or promote products derived from this -* Software without specific prior written permission. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE -* CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH -* THE SOFTWARE. -******************************************************************************/ - #ifndef AMD_HSA_CODE_HPP_ #define AMD_HSA_CODE_HPP_ diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/util/win/os_win.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/util/win/os_win.cpp index 05aba21f59..226b54b4ac 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/util/win/os_win.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/util/win/os_win.cpp @@ -1,43 +1,42 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2014 ADVANCED MICRO DEVICES, INC. -// -// AMD is granting you permission to use this software and documentation(if any) -// (collectively, the "Materials") pursuant to the terms and conditions of the -// Software License Agreement included with the Materials.If you do not have a -// copy of the Software License Agreement, contact your AMD representative for a -// copy. -// -// WARRANTY DISCLAIMER : THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND.AMD DISCLAIMS ALL WARRANTIES, EXPRESS, IMPLIED, OR STATUTORY, -// INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON - INFRINGEMENT, THAT THE -// SOFTWARE WILL RUN UNINTERRUPTED OR ERROR - FREE OR WARRANTIES ARISING FROM -// CUSTOM OF TRADE OR COURSE OF USAGE.THE ENTIRE RISK ASSOCIATED WITH THE USE OF -// THE SOFTWARE IS ASSUMED BY YOU.Some jurisdictions do not allow the exclusion -// of implied warranties, so the above exclusion may not apply to You. -// -// LIMITATION OF LIABILITY AND INDEMNIFICATION : AMD AND ITS LICENSORS WILL NOT, -// UNDER ANY CIRCUMSTANCES BE LIABLE TO YOU FOR ANY PUNITIVE, DIRECT, -// INCIDENTAL, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM USE OF -// THE SOFTWARE OR THIS AGREEMENT EVEN IF AMD AND ITS LICENSORS HAVE BEEN -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.In no event shall AMD's total -// liability to You for all damages, losses, and causes of action (whether in -// contract, tort (including negligence) or otherwise) exceed the amount of $100 -// USD. You agree to defend, indemnify and hold harmless AMD and its licensors, -// and any of their directors, officers, employees, affiliates or agents from -// and against any and all loss, damage, liability and other expenses (including -// reasonable attorneys' fees), resulting from Your use of the Software or -// violation of the terms and conditions of this Agreement. -// -// U.S.GOVERNMENT RESTRICTED RIGHTS : The Materials are provided with -// "RESTRICTED RIGHTS." Use, duplication, or disclosure by the Government is -// subject to the restrictions as set forth in FAR 52.227 - 14 and DFAR252.227 - -// 7013, et seq., or its successor.Use of the Materials by the Government -// constitutes acknowledgement of AMD's proprietary rights in them. -// -// EXPORT RESTRICTIONS: The Materials may be subject to export restrictions as -// stated in the Software License Agreement. +// The University of Illinois/NCSA +// Open Source License (NCSA) +// +// Copyright (c) 2014-2020, Advanced Micro Devices, Inc. All rights reserved. +// +// Developed by: +// +// AMD Research and AMD HSA Software Development +// +// Advanced Micro Devices, Inc. +// +// www.amd.com +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal with the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// - Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimers. +// - Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimers in +// the documentation and/or other materials provided with the distribution. +// - Neither the names of Advanced Micro Devices, Inc, +// nor the names of its contributors may be used to endorse or promote +// products derived from this Software without specific prior written +// permission. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS WITH THE SOFTWARE. // //////////////////////////////////////////////////////////////////////////////// diff --git a/projects/rocr-runtime/runtime/hsa-runtime/inc/hsa_ven_amd_aqlprofile.h b/projects/rocr-runtime/runtime/hsa-runtime/inc/hsa_ven_amd_aqlprofile.h index 04011e1a01..4e55395a46 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/inc/hsa_ven_amd_aqlprofile.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/inc/hsa_ven_amd_aqlprofile.h @@ -1,46 +1,42 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2017 ADVANCED MICRO DEVICES, INC. -// -// AMD is granting you permission to use this software and documentation(if any) -// (collectively, the "Materials") pursuant to the terms and conditions of the -// Software License Agreement included with the Materials.If you do not have a -// copy of the Software License Agreement, contact your AMD representative for a -// copy. -// -// You agree that you will not reverse engineer or decompile the Materials, in -// whole or in part, except as allowed by applicable law. -// -// WARRANTY DISCLAIMER : THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND.AMD DISCLAIMS ALL WARRANTIES, EXPRESS, IMPLIED, OR STATUTORY, -// INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON - INFRINGEMENT, THAT THE -// SOFTWARE WILL RUN UNINTERRUPTED OR ERROR - FREE OR WARRANTIES ARISING FROM -// CUSTOM OF TRADE OR COURSE OF USAGE.THE ENTIRE RISK ASSOCIATED WITH THE USE OF -// THE SOFTWARE IS ASSUMED BY YOU.Some jurisdictions do not allow the exclusion -// of implied warranties, so the above exclusion may not apply to You. -// -// LIMITATION OF LIABILITY AND INDEMNIFICATION : AMD AND ITS LICENSORS WILL NOT, -// UNDER ANY CIRCUMSTANCES BE LIABLE TO YOU FOR ANY PUNITIVE, DIRECT, -// INCIDENTAL, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM USE OF -// THE SOFTWARE OR THIS AGREEMENT EVEN IF AMD AND ITS LICENSORS HAVE BEEN -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.In no event shall AMD's total -// liability to You for all damages, losses, and causes of action (whether in -// contract, tort (including negligence) or otherwise) exceed the amount of $100 -// USD. You agree to defend, indemnify and hold harmless AMD and its licensors, -// and any of their directors, officers, employees, affiliates or agents from -// and against any and all loss, damage, liability and other expenses (including -// reasonable attorneys' fees), resulting from Your use of the Software or -// violation of the terms and conditions of this Agreement. -// -// U.S.GOVERNMENT RESTRICTED RIGHTS : The Materials are provided with -// "RESTRICTED RIGHTS." Use, duplication, or disclosure by the Government is -// subject to the restrictions as set forth in FAR 52.227 - 14 and DFAR252.227 - -// 7013, et seq., or its successor.Use of the Materials by the Government -// constitutes acknowledgement of AMD's proprietary rights in them. -// -// EXPORT RESTRICTIONS: The Materials may be subject to export restrictions as -// stated in the Software License Agreement. +// The University of Illinois/NCSA +// Open Source License (NCSA) +// +// Copyright (c) 2017-2020, Advanced Micro Devices, Inc. All rights reserved. +// +// Developed by: +// +// AMD Research and AMD HSA Software Development +// +// Advanced Micro Devices, Inc. +// +// www.amd.com +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal with the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// - Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimers. +// - Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimers in +// the documentation and/or other materials provided with the distribution. +// - Neither the names of Advanced Micro Devices, Inc, +// nor the names of its contributors may be used to endorse or promote +// products derived from this Software without specific prior written +// permission. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS WITH THE SOFTWARE. // ////////////////////////////////////////////////////////////////////////////////