Skip to content

Commit b7d1047

Browse files
lamb-jjmmartinez
andauthored
[Comgr][NFC] Switch from Illinois to Apache license
Because almost all of LLVM has now switched to the Apache v2.0 with LLVM Exceptions license, it also make sense for Comgr to switch as well As we already needed to update and fix missing licence headers for Comgr, now is a good time to make the switch --------- Co-authored-by: MartinezFernandez, Juan <[email protected]>
1 parent fd9dd00 commit b7d1047

File tree

108 files changed

+1008
-3060
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1008
-3060
lines changed

amd/comgr/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ else()
333333
install(FILES
334334
"README.md"
335335
"LICENSE.txt"
336-
"NOTICES.txt"
337336
COMPONENT amd-comgr
338337
DESTINATION ${CMAKE_INSTALL_DOCDIR})
339338
endif()

amd/comgr/LICENSE.txt

Lines changed: 262 additions & 14 deletions
Large diffs are not rendered by default.

amd/comgr/NOTICES.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

amd/comgr/cmake/device-libs-id.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Part of Comgr, under the Apache License v2.0 with LLVM Exceptions. See
2+
# amd/comgr/LICENSE.TXT in this repository for license information.
3+
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
15
from argparse import ArgumentParser
26
from hashlib import sha256
37
from functools import reduce

amd/comgr/docs/ReleaseNotes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ behaviors:
2525
- caching clang driver invocations
2626
More information about the Comgr Caching infrastructure and how to use it can
2727
be found in amd/comgr/README.md.
28+
- Updated the license used for Comgr from Illinois to Apache 2.0 with LLVM
29+
Extensions (the same license used by LLVM).
30+
2831

2932
Bug Fixes
3033
---------

amd/comgr/include/amd_comgr.h.in

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,18 @@
1-
/*******************************************************************************
2-
*
3-
* University of Illinois/NCSA
4-
* Open Source License
5-
*
6-
* Copyright (c) 2018 Advanced Micro Devices, Inc. All Rights Reserved.
7-
*
8-
* Permission is hereby granted, free of charge, to any person obtaining a copy
9-
* of this software and associated documentation files (the "Software"), to deal
10-
* with the Software without restriction, including without limitation the
11-
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12-
* sell copies of the Software, and to permit persons to whom the Software is
13-
* furnished to do so, subject to the following conditions:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice,
16-
* this list of conditions and the following disclaimers.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright
19-
* notice, this list of conditions and the following disclaimers in the
20-
* documentation and/or other materials provided with the distribution.
21-
*
22-
* * Neither the names of Advanced Micro Devices, Inc. nor the names of its
23-
* contributors may be used to endorse or promote products derived from
24-
* this Software without specific prior written permission.
25-
*
26-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
27-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
28-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
29-
* CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
30-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
31-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
32-
* THE SOFTWARE.
33-
*
34-
*******************************************************************************/
1+
//===- amd_comgr.h.in - User-facing APIs ----------------------------------===//
2+
//
3+
// Part of Comgr, under the Apache License v2.0 with LLVM Exceptions. See
4+
// amd/comgr/LICENSE.TXT in this repository for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
///
9+
/// \file
10+
/// This file defines the user-facing Comgr APIs, including compilation,
11+
/// metadata, and disassembly, symbol lookup, and symbolization APIs.
12+
///
13+
/// It is copied into amd_comgr.h by CMake during the Comgr build.
14+
///
15+
//===----------------------------------------------------------------------===//
3516

3617
#ifndef AMD_COMGR_H_
3718
#define AMD_COMGR_H_

amd/comgr/src/comgr-cache-command.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
//===- comgr-cache-command.cpp - CacheCommand implementation --------------===//
2+
//
3+
// Part of Comgr, under the Apache License v2.0 with LLVM Exceptions. See
4+
// amd/comgr/LICENSE.TXT in this repository for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
///
9+
/// \file
10+
/// This file implements the CachedCommandAdaptor: the interface and common
11+
/// operations for commands that save their execution results in the cache.
12+
///
13+
//===----------------------------------------------------------------------===//
14+
115
#include "comgr-cache-command.h"
216
#include "comgr-cache.h"
317
#include "comgr-device-libs.h"

amd/comgr/src/comgr-cache-command.h

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,10 @@
1-
/*******************************************************************************
2-
*
3-
* University of Illinois/NCSA
4-
* Open Source License
5-
*
6-
* Copyright (c) 2018 Advanced Micro Devices, Inc. All Rights Reserved.
7-
*
8-
* Permission is hereby granted, free of charge, to any person obtaining a copy
9-
* of this software and associated documentation files (the "Software"), to deal
10-
* with the Software without restriction, including without limitation the
11-
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12-
* sell copies of the Software, and to permit persons to whom the Software is
13-
* furnished to do so, subject to the following conditions:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice,
16-
* this list of conditions and the following disclaimers.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright
19-
* notice, this list of conditions and the following disclaimers in the
20-
* documentation and/or other materials provided with the distribution.
21-
*
22-
* * Neither the names of Advanced Micro Devices, Inc. nor the names of its
23-
* contributors may be used to endorse or promote products derived from
24-
* this Software without specific prior written permission.
25-
*
26-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
27-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
28-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
29-
* CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
30-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
31-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
32-
* THE SOFTWARE.
33-
*
34-
******************************************************************************/
1+
//===- comgr-cache-command.h - CacheCommand implementation ----------------===//
2+
//
3+
// Part of Comgr, under the Apache License v2.0 with LLVM Exceptions. See
4+
// amd/comgr/LICENSE.TXT in this repository for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
358

369
#ifndef COMGR_CACHE_COMMAND_H
3710
#define COMGR_CACHE_COMMAND_H

amd/comgr/src/comgr-cache.cpp

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,17 @@
1-
/*******************************************************************************
2-
*
3-
* University of Illinois/NCSA
4-
* Open Source License
5-
*
6-
* Copyright (c) 2018 Advanced Micro Devices, Inc. All Rights Reserved.
7-
*
8-
* Permission is hereby granted, free of charge, to any person obtaining a copy
9-
* of this software and associated documentation files (the "Software"), to deal
10-
* with the Software without restriction, including without limitation the
11-
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12-
* sell copies of the Software, and to permit persons to whom the Software is
13-
* furnished to do so, subject to the following conditions:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice,
16-
* this list of conditions and the following disclaimers.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright
19-
* notice, this list of conditions and the following disclaimers in the
20-
* documentation and/or other materials provided with the distribution.
21-
*
22-
* * Neither the names of Advanced Micro Devices, Inc. nor the names of its
23-
* contributors may be used to endorse or promote products derived from
24-
* this Software without specific prior written permission.
25-
*
26-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
27-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
28-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
29-
* CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
30-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
31-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
32-
* THE SOFTWARE.
33-
*
34-
******************************************************************************/
1+
//===- comgr-cache.cpp - Comgr Cache implementation -----------------------===//
2+
//
3+
// Part of Comgr, under the Apache License v2.0 with LLVM Exceptions. See
4+
// amd/comgr/LICENSE.TXT in this repository for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
///
9+
/// \file
10+
/// This file implements the CommandCache that is used to store the
11+
/// CachedCommandAdaptor execution results. The implementation relies on LLVM's
12+
/// localCache.
13+
///
14+
//===----------------------------------------------------------------------===//
3515

3616
#include "comgr-cache.h"
3717
#include "comgr-cache-command.h"

amd/comgr/src/comgr-cache.h

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,10 @@
1-
/*******************************************************************************
2-
*
3-
* University of Illinois/NCSA
4-
* Open Source License
5-
*
6-
* Copyright (c) 2018 Advanced Micro Devices, Inc. All Rights Reserved.
7-
*
8-
* Permission is hereby granted, free of charge, to any person obtaining a copy
9-
* of this software and associated documentation files (the "Software"), to deal
10-
* with the Software without restriction, including without limitation the
11-
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12-
* sell copies of the Software, and to permit persons to whom the Software is
13-
* furnished to do so, subject to the following conditions:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice,
16-
* this list of conditions and the following disclaimers.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright
19-
* notice, this list of conditions and the following disclaimers in the
20-
* documentation and/or other materials provided with the distribution.
21-
*
22-
* * Neither the names of Advanced Micro Devices, Inc. nor the names of its
23-
* contributors may be used to endorse or promote products derived from
24-
* this Software without specific prior written permission.
25-
*
26-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
27-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
28-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
29-
* CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
30-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
31-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
32-
* THE SOFTWARE.
33-
*
34-
******************************************************************************/
1+
//===- comgr-cache.h - Comgr Cache implementation -------------------------===//
2+
//
3+
// Part of Comgr, under the Apache License v2.0 with LLVM Exceptions. See
4+
// amd/comgr/LICENSE.TXT in this repository for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
358

369
#ifndef COMGR_CACHE_H
3710
#define COMGR_CACHE_H

0 commit comments

Comments
 (0)