mirror of
https://github.com/pezkuwichain/revive.git
synced 2026-06-14 19:11:04 +00:00
Compare commits
150 Commits
v0.1.0-dev.7
...
v0.4.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 2090830858 | |||
| 93c6387dae | |||
| 7346d82dfa | |||
| 39a6db7266 | |||
| 8240163be0 | |||
| b560d72139 | |||
| 6858cb9a61 | |||
| 1cc4f967b4 | |||
| 713b7e5409 | |||
| ffc13697ed | |||
| 94ec34c4d5 | |||
| 13faedf08a | |||
| 2f89c743ce | |||
| ea0ea711ad | |||
| b31e8a0d74 | |||
| 903cbd7159 | |||
| 72f9e4f66e | |||
| a96e1a4233 | |||
| 56aadce0a9 | |||
| 9751481f6b | |||
| c285a6ec3d | |||
| a0396dd6d0 | |||
| 141a8b752c | |||
| 7c932f719b | |||
| b238913a7d | |||
| ed608699af | |||
| 75fc23c810 | |||
| 486c9c28a1 | |||
| 7656c6a8b4 | |||
| 8754d802fa | |||
| 63f0266fff | |||
| e94432eaa0 | |||
| 1fc3aa1554 | |||
| a77ab501c8 | |||
| 8a3c587bbe | |||
| 45b6a57cae | |||
| 8a730f42cc | |||
| 413819facd | |||
| fa0ad68279 | |||
| 004c71d5d5 | |||
| 4d659ac2a6 | |||
| ed9dc60417 | |||
| 3b9144ef3b | |||
| bd4e108bb0 | |||
| 090e3ac13c | |||
| 3389865af7 | |||
| af39d506d9 | |||
| bb2f829361 | |||
| 1b8fcc4649 | |||
| 0e9e405f21 | |||
| 722dd86c27 | |||
| 0421869e4b | |||
| 32f55b976c | |||
| 459a786299 | |||
| fbaa45f283 | |||
| f2fac85dae | |||
| b8f3073e29 | |||
| 11d47d74ac | |||
| e3a9c95d32 | |||
| a560b2d919 | |||
| e07d0f0cb7 | |||
| f6a412eef4 | |||
| 20e77cb0b5 | |||
| 357bf58868 | |||
| f937188991 | |||
| 6e44488b4f | |||
| 5003f3e9ac | |||
| 431b5a2ce5 | |||
| ad3315346c | |||
| 516f79ee0f | |||
| 9f5443b6d6 | |||
| 0dafc779ce | |||
| 7d8fa75a0f | |||
| 80f94b5c76 | |||
| dab29bc89b | |||
| 313c033261 | |||
| 87c1d7a8be | |||
| 8a98346a9c | |||
| 1b4d2c6bb8 | |||
| 004b8ac16c | |||
| 497dae2494 | |||
| 36ea69b50f | |||
| 2bbc5d713d | |||
| 4a9b651235 | |||
| 66f9a4d64f | |||
| 76f4cf71d6 | |||
| 77e0344d80 | |||
| 2fb8beee62 | |||
| 93788e72e9 | |||
| 296a226d0b | |||
| 84deb3a29d | |||
| ee064671e0 | |||
| 63dfd046e5 | |||
| 08f341ccc1 | |||
| a07968205b | |||
| 7ffe64ed7c | |||
| f1bce4fe3f | |||
| 9efbb4c0b4 | |||
| bcc8fa892c | |||
| 89ec25da65 | |||
| 75a83af4da | |||
| 9c330ef8fc | |||
| 687cec31ef | |||
| 48a019e0ad | |||
| 17a2d2f9f2 | |||
| 6ad7908c5e | |||
| 840a736fc5 | |||
| 89cdfefab4 | |||
| 6c2c633651 | |||
| a73b0925c6 | |||
| ee650cf03a | |||
| c2210442b6 | |||
| cb268850a9 | |||
| f3a86588f3 | |||
| 7233738f45 | |||
| 79ec4dd04b | |||
| 374563bbe5 | |||
| a921e425b4 | |||
| 60fc09f787 | |||
| 10b8ff989c | |||
| 157647d5c1 | |||
| 35419e8202 | |||
| de3e7bf253 | |||
| 9fb24b607d | |||
| ba7310fdff | |||
| 4ef495beea | |||
| 8ed689e7ec | |||
| bfda465c32 | |||
| ab90af49df | |||
| 8201401fef | |||
| 1a8a7926e9 | |||
| bec5d60b7c | |||
| 3608a5a143 | |||
| 888723eb0d | |||
| fe1b3258d2 | |||
| d8a72e580b | |||
| bd1a22a702 | |||
| cec283986f | |||
| 06f43083c3 | |||
| b78b2b2af9 | |||
| 8ffe072fee | |||
| 71fb3ab8d6 | |||
| 3e7579580b | |||
| ad805543b3 | |||
| 4fbfb97b9e | |||
| 939138d0cd | |||
| 7f81f37e0c | |||
| fde9edab10 | |||
| d7d60da6f1 | |||
| f49d145e9a |
@@ -0,0 +1,20 @@
|
||||
[target.wasm32-unknown-emscripten]
|
||||
rustflags = [
|
||||
"-Clink-arg=-sEXPORTED_FUNCTIONS=_main,_free,_malloc",
|
||||
"-Clink-arg=-sNO_INVOKE_RUN=1",
|
||||
"-Clink-arg=-sEXIT_RUNTIME=1",
|
||||
"-Clink-arg=-sALLOW_MEMORY_GROWTH=1",
|
||||
"-Clink-arg=-sEXPORTED_RUNTIME_METHODS=FS,callMain,stringToNewUTF8",
|
||||
"-Clink-arg=-sMODULARIZE=1",
|
||||
"-Clink-arg=-sEXPORT_NAME=createRevive",
|
||||
"-Clink-arg=-sWASM_ASYNC_COMPILATION=0",
|
||||
"-Clink-arg=-sDYNAMIC_EXECUTION=0",
|
||||
"-Clink-arg=-sALLOW_TABLE_GROWTH=1",
|
||||
"-Clink-arg=--js-library=js/emscripten/embed/soljson_interface.js",
|
||||
"-Clink-arg=--pre-js=js/emscripten/embed/pre.js",
|
||||
"-Clink-arg=-sSTACK_SIZE=128kb",
|
||||
"-Clink-arg=-sNODEJS_CATCH_EXIT=0"
|
||||
]
|
||||
|
||||
[build]
|
||||
rustdocflags = ["-D", "warnings"]
|
||||
@@ -0,0 +1,7 @@
|
||||
emsdk
|
||||
llvm*/
|
||||
target-llvm/
|
||||
target/
|
||||
node_modules/
|
||||
utils/
|
||||
build/
|
||||
@@ -0,0 +1,19 @@
|
||||
name: "Get Emscripten SDK"
|
||||
inputs:
|
||||
version:
|
||||
description: ""
|
||||
required: false
|
||||
default: "4.0.9"
|
||||
|
||||
|
||||
runs:
|
||||
using: "composite"
|
||||
steps:
|
||||
- name: install emsdk
|
||||
shell: bash
|
||||
run: |
|
||||
git clone https://github.com/emscripten-core/emsdk.git ./emsdk/
|
||||
cd emsdk
|
||||
git checkout tags/${{ inputs.version }}
|
||||
./emsdk install ${{ inputs.version }}
|
||||
./emsdk activate ${{ inputs.version }}
|
||||
@@ -0,0 +1,70 @@
|
||||
# example:
|
||||
# - uses: ./.github/actions/get-llvm
|
||||
# with:
|
||||
# target: x86_64-unknown-linux-gnu
|
||||
|
||||
name: "Download LLVM"
|
||||
inputs:
|
||||
target:
|
||||
required: true
|
||||
|
||||
runs:
|
||||
using: "composite"
|
||||
steps:
|
||||
- name: find asset
|
||||
id: find
|
||||
uses: actions/github-script@v7
|
||||
env:
|
||||
target: ${{ inputs.target }}
|
||||
with:
|
||||
result-encoding: string
|
||||
script: |
|
||||
let page = 1;
|
||||
let releases = [];
|
||||
|
||||
let releasePrefix = "llvm-"
|
||||
let target = process.env.target
|
||||
|
||||
do {
|
||||
const res = await github.rest.repos.listReleases({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
per_page: 50,
|
||||
page,
|
||||
});
|
||||
|
||||
releases = res.data
|
||||
releases.sort((a, b) => {
|
||||
return (a.published_at < b.published_at) ? 1 : ((a.published_at > b.published_at) ? -1 : 0);
|
||||
});
|
||||
|
||||
let llvmLatestRelease = releases.find(release => {
|
||||
return release.tag_name.startsWith(releasePrefix);
|
||||
});
|
||||
if (llvmLatestRelease){
|
||||
let asset = llvmLatestRelease.assets.find(asset =>{
|
||||
return asset.name.includes(target);
|
||||
});
|
||||
if (!asset){
|
||||
core.setFailed(`Artifact for '${target}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
|
||||
process.exit();
|
||||
}
|
||||
return asset.browser_download_url;
|
||||
}
|
||||
|
||||
page++;
|
||||
} while(releases.length > 0);
|
||||
|
||||
core.setFailed(`No LLVM releases with '${releasePrefix}' atifacts found! Please release LLVM before running this workflow.`);
|
||||
process.exit();
|
||||
|
||||
- name: download
|
||||
shell: bash
|
||||
run: |
|
||||
curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
|
||||
|
||||
- name: unpack
|
||||
shell: bash
|
||||
run: |
|
||||
tar -xf llvm.tar.gz
|
||||
rm llvm.tar.gz
|
||||
@@ -0,0 +1,36 @@
|
||||
name: "Install Solidity Compiler"
|
||||
description: "Installs the Ethereum solc Solidity compiler frontend executable"
|
||||
|
||||
runs:
|
||||
using: "composite"
|
||||
steps:
|
||||
- name: Figure out Solc Download URL
|
||||
shell: bash
|
||||
run: |
|
||||
if [[ "${{ runner.os }}" == "Linux" ]]; then
|
||||
echo "SOLC_NAME=solc-static-linux" >> $GITHUB_ENV
|
||||
elif [[ "${{ runner.os }}" == "Windows" ]]; then
|
||||
echo "SOLC_NAME=solc-windows.exe" >> $GITHUB_ENV
|
||||
else
|
||||
echo "SOLC_NAME=solc-macos" >> $GITHUB_ENV
|
||||
fi
|
||||
|
||||
- name: Download Solc
|
||||
shell: bash
|
||||
run: |
|
||||
mkdir -p solc
|
||||
curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.30/${SOLC_NAME}
|
||||
|
||||
- name: Make Solc Executable
|
||||
if: ${{ runner.os == 'Windows' }}
|
||||
shell: bash
|
||||
run: |
|
||||
echo "$(pwd -W)\\solc" >> $GITHUB_PATH
|
||||
mv solc/solc solc/solc.exe
|
||||
|
||||
- name: Make Solc Executable
|
||||
if: ${{ runner.os != 'Windows' }}
|
||||
shell: bash
|
||||
run: |
|
||||
echo "$(pwd)/solc" >> $GITHUB_PATH
|
||||
chmod +x solc/solc
|
||||
@@ -0,0 +1,175 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
This script generates JSON files for different platforms based on GitHub release data.
|
||||
It fetches release information from a specified GitHub repository and tag,
|
||||
parses the release assets, and generates JSON files for each platform with relevant metadata.
|
||||
It also handles checksum files and updates a list.json file for each platform.
|
||||
It requires the GITHUB_TOKEN environment variable to be set for authentication.
|
||||
Usage:
|
||||
python json_generator.py <repo> <tag>
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
import requests
|
||||
|
||||
def validate_github_token():
|
||||
"""Validate that GITHUB_TOKEN environment variable is set."""
|
||||
if 'GITHUB_TOKEN' not in os.environ:
|
||||
print("Error: GITHUB_TOKEN environment variable is not set.")
|
||||
sys.exit(1)
|
||||
|
||||
def fetch_release_data(repo, tag):
|
||||
"""Fetch release data from GitHub API."""
|
||||
url = f"https://api.github.com/repos/{repo}/releases/tags/{tag}"
|
||||
headers = {
|
||||
'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
|
||||
'Accept': 'application/vnd.github+json',
|
||||
'X-GitHub-Api-Version': '2022-11-28'
|
||||
}
|
||||
|
||||
try:
|
||||
response = requests.get(url, headers=headers)
|
||||
response.raise_for_status()
|
||||
return response.json()
|
||||
except requests.RequestException as e:
|
||||
print(f"Error fetching release data: {e}")
|
||||
sys.exit(1)
|
||||
|
||||
def fetch_checksum_file(release_data):
|
||||
"""
|
||||
Fetch the checksum.txt file from the release assets
|
||||
and parse it into a dictionary mapping file names to their SHA256 checksums.
|
||||
"""
|
||||
checksums = {}
|
||||
|
||||
# Find the checksum.txt asset URL
|
||||
checksum_asset = None
|
||||
for asset in release_data['assets']:
|
||||
if asset['name'] == 'checksums.txt':
|
||||
checksum_asset = asset
|
||||
break
|
||||
|
||||
if not checksum_asset:
|
||||
print("Warning: checksum.txt file not found in release assets.")
|
||||
return checksums
|
||||
|
||||
# Download the checksum file
|
||||
headers = {
|
||||
'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
|
||||
'Accept': 'application/octet-stream'
|
||||
}
|
||||
|
||||
try:
|
||||
response = requests.get(checksum_asset['browser_download_url'], headers=headers)
|
||||
response.raise_for_status()
|
||||
|
||||
# Parse checksum file
|
||||
for line in response.text.splitlines():
|
||||
if line.strip():
|
||||
checksum, filename = line.strip().split(None, 1)
|
||||
checksums[filename] = checksum
|
||||
|
||||
return checksums
|
||||
except requests.RequestException as e:
|
||||
print(f"Error fetching checksum file: {e}")
|
||||
return checksums
|
||||
except Exception as e:
|
||||
print(f"Error parsing checksum file: {e}")
|
||||
return checksums
|
||||
|
||||
def extract_build_hash(target_commitish):
|
||||
"""Extract the first 8 characters of the commit hash."""
|
||||
return f"commit.{target_commitish[:8]}"
|
||||
|
||||
def generate_asset_json(release_data, asset, checksums):
|
||||
"""Generate JSON for a specific asset."""
|
||||
version = release_data['tag_name'].lstrip('v')
|
||||
build = extract_build_hash(release_data['target_commitish'])
|
||||
long_version = f"{version}+{build}"
|
||||
|
||||
# Get SHA256 checksum if available
|
||||
sha256 = checksums.get(asset['name'], "")
|
||||
|
||||
return {
|
||||
"name": asset['name'],
|
||||
"version": version,
|
||||
"build": build,
|
||||
"longVersion": long_version,
|
||||
"url": asset['browser_download_url'],
|
||||
"sha256": sha256,
|
||||
"firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION", ""),
|
||||
"lastSolcVersion": os.environ.get("LAST_SOLC_VERSION", "")
|
||||
}
|
||||
|
||||
def save_platform_json(platform_folder, asset_json, tag):
|
||||
"""Save asset JSON and update list.json for a specific platform."""
|
||||
# Create platform folder if it doesn't exist
|
||||
os.makedirs(platform_folder, exist_ok=True)
|
||||
|
||||
# Update or create list.json
|
||||
list_file_path = os.path.join(platform_folder, "list.json")
|
||||
|
||||
if os.path.exists(list_file_path):
|
||||
with open(list_file_path, 'r') as f:
|
||||
try:
|
||||
list_data = json.load(f)
|
||||
except json.JSONDecodeError:
|
||||
list_data = {"builds": [], "releases": {}, "latestRelease": ""}
|
||||
else:
|
||||
list_data = {"builds": [], "releases": {}, "latestRelease": ""}
|
||||
|
||||
# Remove any existing entry with the same path
|
||||
list_data['builds'] = [
|
||||
build for build in list_data['builds']
|
||||
if build['version'] != asset_json['version']
|
||||
]
|
||||
# Add the new build
|
||||
list_data['builds'].append(asset_json)
|
||||
|
||||
# Update releases
|
||||
version = asset_json['version']
|
||||
list_data['releases'][version] = f"{asset_json['name']}+{asset_json['longVersion']}"
|
||||
|
||||
# Update latest release
|
||||
list_data['latestRelease'] = version
|
||||
|
||||
with open(list_file_path, 'w') as f:
|
||||
json.dump(list_data, f, indent=4)
|
||||
|
||||
def main():
|
||||
# Validate arguments
|
||||
if len(sys.argv) != 3:
|
||||
print("Usage: python script.py <repo> <tag>")
|
||||
sys.exit(1)
|
||||
|
||||
repo, tag = sys.argv[1], sys.argv[2]
|
||||
|
||||
# Validate GitHub token
|
||||
validate_github_token()
|
||||
|
||||
# Fetch release data
|
||||
release_data = fetch_release_data(repo, tag)
|
||||
|
||||
# Fetch checksums
|
||||
checksums = fetch_checksum_file(release_data)
|
||||
|
||||
# Mapping of asset names to platform folders
|
||||
platform_mapping = {
|
||||
'resolc-x86_64-unknown-linux-musl': 'linux',
|
||||
'resolc-universal-apple-darwin': 'macos',
|
||||
'resolc-x86_64-pc-windows-msvc.exe': 'windows',
|
||||
'resolc_web.js': 'wasm'
|
||||
}
|
||||
|
||||
# Process each asset
|
||||
for asset in release_data['assets']:
|
||||
platform_name = platform_mapping.get(asset['name'])
|
||||
if platform_name:
|
||||
platform_folder = os.path.join(platform_name)
|
||||
asset_json = generate_asset_json(release_data, asset, checksums)
|
||||
save_platform_json(platform_folder, asset_json, tag)
|
||||
print(f"Processed {asset['name']} for {platform_name}")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -0,0 +1,155 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
This script generates JSON files for different platforms based on GitHub data.
|
||||
Requires the GITHUB_SHA, FIRST_SOLC_VERSION, LAST_SOLC_VERSION, TAG and FILEPATH environment variables to be set.
|
||||
Usage:
|
||||
python json_generator_nightly.py
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
from datetime import datetime
|
||||
|
||||
def validate_env_variables():
|
||||
"""Validate that environment variables are set."""
|
||||
if "GITHUB_SHA" not in os.environ:
|
||||
print("Error: GITHUB_SHA environment variable is not set.")
|
||||
sys.exit(1)
|
||||
if "FIRST_SOLC_VERSION" not in os.environ:
|
||||
print("Error: FIRST_SOLC_VERSION environment variable is not set.")
|
||||
sys.exit(1)
|
||||
if "LAST_SOLC_VERSION" not in os.environ:
|
||||
print("Error: LAST_SOLC_VERSION environment variable is not set.")
|
||||
sys.exit(1)
|
||||
if "TAG" not in os.environ:
|
||||
print("Error: TAG environment variable is not set.")
|
||||
sys.exit(1)
|
||||
if "FILEPATH" not in os.environ:
|
||||
print("Error: FILEPATH environment variable is not set.")
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def fetch_data_file():
|
||||
"""
|
||||
Fetch the data.json file with artifacts urls and sha256 checksums
|
||||
and parse it into a single dictionary mapping artifact names to their URLs and SHAs.
|
||||
"""
|
||||
# read data.json file
|
||||
artifacts_data = {}
|
||||
data_file_path = os.environ["FILEPATH"]
|
||||
if not os.path.exists(data_file_path):
|
||||
print("Error: data.json file not found.")
|
||||
sys.exit(1)
|
||||
with open(data_file_path, 'r') as f:
|
||||
try:
|
||||
artifacts_data = json.load(f)
|
||||
except json.JSONDecodeError:
|
||||
print("Error: data.json file is not a valid JSON.")
|
||||
sys.exit(1)
|
||||
|
||||
result = {}
|
||||
|
||||
for item in artifacts_data:
|
||||
for key, value in item.items():
|
||||
if key.endswith('_url'):
|
||||
base_key = key.rsplit('_url', 1)[0]
|
||||
if base_key not in result:
|
||||
result[base_key] = {}
|
||||
result[base_key]['url'] = value
|
||||
elif key.endswith('_sha'):
|
||||
base_key = key.rsplit('_sha', 1)[0]
|
||||
if base_key not in result:
|
||||
result[base_key] = {}
|
||||
result[base_key]['sha'] = value
|
||||
|
||||
return result
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def extract_build_hash():
|
||||
"""Extract the first 8 characters of the commit hash."""
|
||||
sha = os.environ.get("GITHUB_SHA")
|
||||
return f"commit.{sha[:8]}"
|
||||
|
||||
def generate_asset_json_nightly(name, url, checksum):
|
||||
"""Generate JSON for a specific asset."""
|
||||
# Date in format YYYY-MM-DD
|
||||
date = datetime.now().strftime("%Y.%-m.%-d")
|
||||
last_version = os.environ.get("TAG").replace('v','')
|
||||
version = f"{last_version}-nightly.{date}"
|
||||
SHA = os.environ.get("GITHUB_SHA", "")[:8]
|
||||
build = f"commit.{SHA}"
|
||||
long_version = f"{version}+{build}"
|
||||
|
||||
return {
|
||||
"name": name,
|
||||
"version": version,
|
||||
"build": build,
|
||||
"longVersion": long_version,
|
||||
"url": url,
|
||||
"sha256": checksum,
|
||||
"firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION"),
|
||||
"lastSolcVersion": os.environ.get("LAST_SOLC_VERSION")
|
||||
}
|
||||
|
||||
def save_platform_json(platform_folder, asset_json):
|
||||
"""Save asset JSON and update list.json for a specific platform."""
|
||||
# Create platform folder if it doesn't exist
|
||||
os.makedirs(platform_folder, exist_ok=True)
|
||||
|
||||
# Update or create list.json
|
||||
list_file_path = os.path.join(platform_folder, "list.json")
|
||||
|
||||
if os.path.exists(list_file_path):
|
||||
with open(list_file_path, 'r') as f:
|
||||
try:
|
||||
list_data = json.load(f)
|
||||
except json.JSONDecodeError:
|
||||
list_data = {"builds": [], "releases": {}, "latestRelease": ""}
|
||||
else:
|
||||
list_data = {"builds": [], "releases": {}, "latestRelease": ""}
|
||||
|
||||
# Remove any existing entry with the same path
|
||||
list_data['builds'] = [
|
||||
build for build in list_data['builds']
|
||||
if build['version'] != asset_json['version']
|
||||
]
|
||||
# Add the new build
|
||||
list_data['builds'].append(asset_json)
|
||||
|
||||
# Update releases
|
||||
version = asset_json['version']
|
||||
list_data['releases'][version] = f"{asset_json['name']}+{asset_json['longVersion']}"
|
||||
|
||||
# Update latest release
|
||||
list_data['latestRelease'] = version
|
||||
|
||||
with open(list_file_path, 'w') as f:
|
||||
json.dump(list_data, f, indent=4)
|
||||
|
||||
def main():
|
||||
|
||||
validate_env_variables()
|
||||
data = fetch_data_file()
|
||||
|
||||
# Mapping of asset names to platform folders
|
||||
platform_mapping = {
|
||||
'resolc-x86_64-unknown-linux-musl': 'linux',
|
||||
'resolc-universal-apple-darwin': 'macos',
|
||||
'resolc-x86_64-pc-windows-msvc': 'windows',
|
||||
'resolc-web.js': 'wasm'
|
||||
}
|
||||
|
||||
# Process each asset
|
||||
for asset in data.keys():
|
||||
platform_name = platform_mapping.get(asset)
|
||||
if platform_name:
|
||||
platform_folder = os.path.join(platform_name)
|
||||
asset_json = generate_asset_json_nightly(asset, data[asset]['url'], data[asset]['sha'])
|
||||
save_platform_json(platform_folder, asset_json)
|
||||
print(f"Processed {asset} for {platform_name}")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -1,38 +0,0 @@
|
||||
name: Build revive-debian
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
REVIVE_DEBIAN_PACKAGE: revive-debian-x86
|
||||
DEBIAN_CONTAINER: revive-builder-debian-x86
|
||||
DEBIAN_CONTAINER_BUILDER: build-debian-builder.sh
|
||||
DEBIAN_CONTAINER_RUNNER: run-debian-builder.sh
|
||||
REVIVE_DEBIAN_INSTALL: ${{ github.workspace }}/target/release
|
||||
REVIVE_DEBIAN_BINARY: resolc
|
||||
RUST_VERSION: "1.80"
|
||||
|
||||
jobs:
|
||||
build-revive-debian-x86:
|
||||
name: debian-container-x86
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: build-container
|
||||
run: |
|
||||
(cd utils && ./${{ env.DEBIAN_CONTAINER_BUILDER}} --build-arg RUST_VERSION=${{ env.RUST_VERSION}} . )
|
||||
|
||||
- name: build-revive-debian
|
||||
run: |
|
||||
rustup show
|
||||
cargo --version
|
||||
rustup +nightly show
|
||||
cargo +nightly --version
|
||||
bash --version
|
||||
utils/${{ env.DEBIAN_CONTAINER_RUNNER }} utils/build-revive.sh -o ${{ env.REVIVE_DEBIAN_INSTALL}}
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ env.REVIVE_DEBIAN_PACKAGE }}
|
||||
path: ${{ env.REVIVE_DEBIAN_INSTALL }}/${{ env.REVIVE_DEBIAN_BINARY }}
|
||||
retention-days: 1
|
||||
@@ -1,79 +0,0 @@
|
||||
name: Build revive-wasm
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
|
||||
EMSCRIPTEN_VERSION: 3.1.64
|
||||
|
||||
jobs:
|
||||
build-revive-wasm:
|
||||
runs-on: ubuntu-22.04
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Cache LLVM build
|
||||
id: cache-llvm
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: |
|
||||
llvm18.0-emscripten
|
||||
# Use a unique key based on LLVM version or configuration files to avoid cache invalidation
|
||||
key: llvm-build-${{ runner.os }}-${{ hashFiles('clone-llvm.sh', 'emscripten-build-llvm.sh') }}
|
||||
|
||||
- name: Install Dependencies
|
||||
run: |
|
||||
sudo apt-get update && sudo apt-get install -y cmake ninja-build libncurses5
|
||||
rustup target add wasm32-unknown-emscripten
|
||||
# Install LLVM required for the compiler runtime, runtime-api and stdlib
|
||||
curl -sSL --output llvm.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/clang+llvm-18.1.4-x86_64-linux-gnu-ubuntu-18.04.tar.xz
|
||||
tar Jxf llvm.tar.xz
|
||||
mv clang+llvm-18.1.4-x86_64-linux-gnu-ubuntu-18.04 llvm18/
|
||||
echo "$(pwd)/llvm18/bin" >> $GITHUB_PATH
|
||||
# Install Emscripten
|
||||
git clone https://github.com/emscripten-core/emsdk.git
|
||||
cd emsdk
|
||||
./emsdk install ${{ env.EMSCRIPTEN_VERSION }}
|
||||
./emsdk activate ${{ env.EMSCRIPTEN_VERSION }}
|
||||
|
||||
- run: |
|
||||
rustup show
|
||||
cargo --version
|
||||
rustup +nightly show
|
||||
cargo +nightly --version
|
||||
cmake --version
|
||||
bash --version
|
||||
llvm-config --version
|
||||
|
||||
- name: Build LLVM
|
||||
if: steps.cache-llvm.outputs.cache-hit != 'true'
|
||||
run: |
|
||||
export EMSDK_ROOT=${PWD}/emsdk
|
||||
./emscripten-build-llvm.sh
|
||||
|
||||
- name: Use Cached LLVM
|
||||
if: steps.cache-llvm.outputs.cache-hit == 'true'
|
||||
run: |
|
||||
echo "Using cached LLVM"
|
||||
|
||||
- name: Build revive
|
||||
run: |
|
||||
export LLVM_LINK_PREFIX=${PWD}/llvm18.0-emscripten
|
||||
source ./emsdk/emsdk_env.sh
|
||||
make install-wasm
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: revive-wasm
|
||||
path: |
|
||||
${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.js
|
||||
${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.wasm
|
||||
retention-days: 1
|
||||
@@ -0,0 +1,64 @@
|
||||
name: Generate JSON for resolc-bin
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
|
||||
jobs:
|
||||
generateJson:
|
||||
runs-on: ubuntu-latest
|
||||
if: contains(github.event.release.tag_name, 'llvm') == false
|
||||
environment: tags
|
||||
env:
|
||||
# the token is needed for json_generator.py
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: tmp
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: paritytech/resolc-bin
|
||||
path: resolc-bin
|
||||
|
||||
- uses: actions/create-github-app-token@v1
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ secrets.REVIVE_JSON_APP_ID }}
|
||||
private-key: ${{ secrets.REVIVE_JSON_APP_KEY }}
|
||||
owner: paritytech
|
||||
repositories: resolc-bin
|
||||
|
||||
- name: Generate json and push
|
||||
env:
|
||||
TOKEN: ${{ steps.app-token.outputs.token }}
|
||||
APP_NAME: "paritytech-revive-json"
|
||||
Green: "\e[32m"
|
||||
NC: "\e[0m"
|
||||
run: |
|
||||
sudo apt-get update && sudo apt-get install -y wget
|
||||
wget https://github.com/${GITHUB_REPOSITORY}/releases/download/${GITHUB_REF_NAME}/resolc-x86_64-unknown-linux-musl
|
||||
chmod +x resolc-x86_64-unknown-linux-musl
|
||||
export FIRST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
|
||||
export LAST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
|
||||
|
||||
cd resolc-bin
|
||||
python ../tmp/.github/scripts/json_generator.py ${GITHUB_REPOSITORY} ${{ github.event.release.tag_name }}
|
||||
|
||||
echo "${Green}Add new remote with gh app token${NC}"
|
||||
git remote set-url origin $(git config remote.origin.url | sed "s/github.com/${APP_NAME}:${TOKEN}@github.com/g")
|
||||
|
||||
echo "${Green}Remove http section that causes issues with gh app auth token${NC}"
|
||||
sed -i.bak '/\[http/d' ./.git/config
|
||||
sed -i.bak '/extraheader/d' ./.git/config
|
||||
|
||||
git config user.email "ci@parity.io"
|
||||
git config user.name "${APP_NAME}"
|
||||
|
||||
git add .
|
||||
git commit -m "Update json"
|
||||
git push origin main
|
||||
|
||||
echo "::notice::info.list files were successfully published to https://github.com/paritytech/resolc-bin"
|
||||
@@ -0,0 +1,137 @@
|
||||
name: Release LLVM
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
llvm_version:
|
||||
type: string
|
||||
required: true
|
||||
description: llvm version in "x.x.x" format, e.g. "18.1.8"
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
create-release-draft:
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: write
|
||||
outputs:
|
||||
version: ${{ steps.resolve-version.outputs.version }}
|
||||
steps:
|
||||
- id: resolve-version
|
||||
run: |
|
||||
echo "version=llvm-${{ inputs.llvm_version }}-revive.${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Create Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
name: ${{ steps.resolve-version.outputs.version }}
|
||||
body: "LLVM is a dependency of revive. The LLVM releases are used by our CI to build revive."
|
||||
draft: true
|
||||
tag_name: ${{ steps.resolve-version.outputs.version }}
|
||||
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-emscripten, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
|
||||
include:
|
||||
- target: x86_64-unknown-linux-gnu
|
||||
builder-arg: gnu
|
||||
host: linux
|
||||
runner: parity-large
|
||||
- target: x86_64-unknown-linux-musl
|
||||
builder-arg: musl
|
||||
host: linux
|
||||
runner: parity-large
|
||||
- target: wasm32-unknown-emscripten
|
||||
builder-arg: emscripten
|
||||
host: linux
|
||||
runner: parity-large
|
||||
- target: aarch64-apple-darwin
|
||||
builder-arg: gnu
|
||||
host: macos
|
||||
runner: macos-14
|
||||
- target: x86_64-apple-darwin
|
||||
builder-arg: gnu
|
||||
host: macos
|
||||
runner: macos-13
|
||||
- target: x86_64-pc-windows-msvc
|
||||
builder-arg: gnu
|
||||
host: windows
|
||||
runner: windows-2022
|
||||
needs: create-release-draft
|
||||
runs-on: ${{ matrix.runner }}
|
||||
env:
|
||||
RUST_LOG: trace
|
||||
permissions:
|
||||
contents: write # for uploading assets to release
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
# without this it will override our rust flags
|
||||
rustflags: ""
|
||||
cache-key: ${{ matrix.target }}
|
||||
|
||||
- name: Install Dependencies
|
||||
if: ${{ matrix.host == 'linux' }}
|
||||
run: |
|
||||
sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
|
||||
|
||||
- name: Install Dependencies
|
||||
if: ${{ matrix.host == 'macos' }}
|
||||
run: |
|
||||
brew install ninja
|
||||
|
||||
- name: Install Dependencies
|
||||
if: ${{ matrix.host == 'windows' }}
|
||||
run: |
|
||||
choco install ninja
|
||||
|
||||
- name: Install LLVM Builder
|
||||
run: |
|
||||
cargo install --locked --force --path crates/llvm-builder
|
||||
|
||||
- name: Clone LLVM
|
||||
run: |
|
||||
revive-llvm --target-env ${{ matrix.builder-arg }} clone
|
||||
|
||||
- name: Build LLVM
|
||||
if: ${{ matrix.target != 'wasm32-unknown-emscripten' }}
|
||||
run: |
|
||||
revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld --llvm-projects clang
|
||||
|
||||
- name: Build LLVM
|
||||
if: ${{ matrix.target == 'wasm32-unknown-emscripten' }}
|
||||
run: |
|
||||
source emsdk/emsdk_env.sh
|
||||
revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld
|
||||
|
||||
- name: Remove Unnecessary Binaries
|
||||
shell: bash
|
||||
run: |
|
||||
cd target-llvm/${{ matrix.builder-arg }}/target-final/bin/
|
||||
rm -f diagtool* llvm-libtool-darwin* llvm-lipo* llvm-pdbutil* llvm-dwarfdump* llvm-nm* llvm-readobj* llvm-cfi-verify* \
|
||||
sancov* llvm-debuginfo-analyzer* llvm-objdump* llvm-profgen* llvm-extract* llvm-jitlink* llvm-c-test* llvm-gsymutil* llvm-dwp* \
|
||||
dsymutil* llvm-dwarfutil* llvm-exegesis* lli clang-rename* bugpoint* clang-extdef-mapping* clang-refactor* c-index-test* \
|
||||
llvm-reduce* llvm-lto* clang-linker-wrapper* llc* llvm-lto2* llvm-otool* llvm-readelf* \
|
||||
clang-repl* clang-check* clang-scan-deps*
|
||||
cd -
|
||||
|
||||
- name: Package Artifact
|
||||
shell: bash
|
||||
run: |
|
||||
mv target-llvm/${{ matrix.builder-arg }}/target-final/ llvm-${{ matrix.target }}
|
||||
tar -czf "${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz" llvm-${{ matrix.target }}
|
||||
|
||||
- name: Add Artifact to Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ needs.create-release-draft.outputs.version }}
|
||||
draft: true
|
||||
files: |
|
||||
${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz
|
||||
@@ -0,0 +1,161 @@
|
||||
name: Nightly Release
|
||||
|
||||
on:
|
||||
schedule:
|
||||
# Run every day at 01:00 UTC
|
||||
- cron: "0 1 * * *"
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
check_commits:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
has_commits: ${{ steps.check_commits.outputs.has_commits }}
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
ref: "main"
|
||||
|
||||
- name: Check for commits from yesterday
|
||||
id: check_commits
|
||||
run: |
|
||||
# Get yesterday's date in YYYY-MM-DD format
|
||||
YESTERDAY=$(date -d "yesterday" +%Y-%m-%d)
|
||||
echo "Checking for commits from: $YESTERDAY"
|
||||
|
||||
# Check if there were any commits yesterday
|
||||
COMMIT_COUNT=$(git log --oneline --since="$YESTERDAY 00:00:00" --until="$YESTERDAY 23:59:59" | wc -l)
|
||||
|
||||
echo "Found $COMMIT_COUNT commits from yesterday"
|
||||
|
||||
if [ $COMMIT_COUNT -gt 0 ]; then
|
||||
echo "has_commits=true" >> $GITHUB_OUTPUT
|
||||
echo "✅ Found $COMMIT_COUNT commits from yesterday - continuing workflow"
|
||||
else
|
||||
echo "has_commits=false" >> $GITHUB_OUTPUT
|
||||
echo "❌ No commits found from yesterday - skipping remaining steps"
|
||||
echo "::notice::❌ No commits found from yesterday - skipping remaining steps"
|
||||
fi
|
||||
|
||||
build:
|
||||
if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
|
||||
needs: [check_commits]
|
||||
uses: ./.github/workflows/reusable-build.yml
|
||||
with:
|
||||
is_release: false
|
||||
retention_days: 40
|
||||
|
||||
create-macos-fat-binary:
|
||||
if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
|
||||
needs: [build]
|
||||
outputs:
|
||||
resolc-universal-apple-darwin_url: ${{ steps.set-output.outputs.resolc-universal-apple-darwin_url }}
|
||||
resolc-universal-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-universal-apple-darwin_sha }}
|
||||
runs-on: macos-14
|
||||
steps:
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
merge-multiple: true
|
||||
|
||||
- name: Create macOS Fat Binary
|
||||
run: |
|
||||
lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
|
||||
|
||||
- name: Make Executable
|
||||
run: |
|
||||
chmod +x resolc-universal-apple-darwin
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
id: artifact-upload-step
|
||||
with:
|
||||
name: resolc-universal-apple-darwin
|
||||
path: resolc-universal-apple-darwin
|
||||
retention-days: 40
|
||||
|
||||
- name: Set output variables
|
||||
id: set-output
|
||||
env:
|
||||
TARGET: resolc-universal-apple-darwin
|
||||
run: |
|
||||
echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
|
||||
echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
generate-nightly-json:
|
||||
runs-on: ubuntu-24.04
|
||||
if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
|
||||
environment: tags
|
||||
needs: [build, create-macos-fat-binary, check_commits]
|
||||
steps:
|
||||
- name: Checkout revive
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: revive
|
||||
|
||||
- name: Checkout resolc-bin
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: paritytech/resolc-bin
|
||||
path: resolc-bin
|
||||
|
||||
- name: Download Artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
merge-multiple: true
|
||||
path: bins
|
||||
|
||||
- uses: actions/create-github-app-token@v1
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ secrets.REVIVE_JSON_APP_ID }}
|
||||
private-key: ${{ secrets.REVIVE_JSON_APP_KEY }}
|
||||
owner: paritytech
|
||||
repositories: resolc-bin
|
||||
|
||||
- name: Generate JSON
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
TOKEN: ${{ steps.app-token.outputs.token }}
|
||||
APP_NAME: "paritytech-revive-json"
|
||||
Green: "\e[32m"
|
||||
NC: "\e[0m"
|
||||
run: |
|
||||
echo '[' > data.json
|
||||
echo '${{ toJSON(needs.build.outputs) }}' >> data.json
|
||||
echo ',' >> data.json
|
||||
echo '${{ toJSON(needs.create-macos-fat-binary.outputs) }}' >> data.json
|
||||
echo ']' >> data.json
|
||||
chmod +x bins/resolc-x86_64-unknown-linux-musl
|
||||
export FIRST_SOLC_VERSION=$(./bins/resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
|
||||
export LAST_SOLC_VERSION=$(./bins/resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
|
||||
export FILEPATH=$(readlink -f data.json)
|
||||
export TAG=$(cd revive;gh release list --json name,isLatest --jq '.[] | select(.isLatest)|.name')
|
||||
cd resolc-bin
|
||||
mkdir -p nightly
|
||||
cd nightly
|
||||
python3 ../../revive/.github/scripts/json_generator_nightly.py
|
||||
cd ..
|
||||
git status
|
||||
|
||||
echo "${Green}Add new remote with gh app token${NC}"
|
||||
git remote set-url origin $(git config remote.origin.url | sed "s/github.com/${APP_NAME}:${TOKEN}@github.com/g")
|
||||
|
||||
echo "${Green}Remove http section that causes issues with gh app auth token${NC}"
|
||||
sed -i.bak '/\[http/d' ./.git/config
|
||||
sed -i.bak '/extraheader/d' ./.git/config
|
||||
|
||||
git config user.email "ci@parity.io"
|
||||
git config user.name "${APP_NAME}"
|
||||
|
||||
git add nightly/
|
||||
git commit -m "Update nightly json"
|
||||
git push origin main
|
||||
|
||||
echo "::notice::nightly info.list files were successfully published to https://github.com/paritytech/resolc-bin"
|
||||
@@ -0,0 +1,165 @@
|
||||
name: Build & Release
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
tags:
|
||||
- "v*"
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
types: [opened, synchronize, labeled, unlabeled]
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
check-version-changed:
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: write
|
||||
env:
|
||||
CURRENT_TAG: ${{ github.ref_name }}
|
||||
outputs:
|
||||
RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Check versions
|
||||
id: versions
|
||||
run: |
|
||||
if [[ $CURRENT_TAG == 'main' ]]; then
|
||||
echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in the main branch"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ $CURRENT_TAG != "v"* ]]; then
|
||||
echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in a PR"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
|
||||
echo "Current tag $CURRENT_TAG"
|
||||
echo "Package version $PKG_VER"
|
||||
|
||||
if [[ $CURRENT_TAG != $PKG_VER ]]; then
|
||||
echo "::error::Tag $CURRENT_TAG doesn't match package version $PKG_VER in Cargo.toml, please fix"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export RELEASE_NOTES="$(sed '/^## '${CURRENT_TAG}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"
|
||||
|
||||
echo "Release notes:"
|
||||
echo "$RELEASE_NOTES"
|
||||
|
||||
echo 'RELEASE_NOTES<<EOF' >> $GITHUB_OUTPUT
|
||||
echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
|
||||
echo 'EOF' >> $GITHUB_OUTPUT
|
||||
|
||||
build:
|
||||
needs: [check-version-changed]
|
||||
uses: ./.github/workflows/reusable-build.yml
|
||||
with:
|
||||
is_release: true
|
||||
retention_days: 1
|
||||
|
||||
create-release:
|
||||
if: startsWith(github.ref_name, 'v')
|
||||
needs: [check-version-changed, build]
|
||||
runs-on: macos-14
|
||||
environment: tags
|
||||
steps:
|
||||
- name: Download Artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
merge-multiple: true
|
||||
|
||||
- name: Create macOS Fat Binary
|
||||
run: |
|
||||
lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
|
||||
|
||||
- name: Make Executable
|
||||
run: |
|
||||
chmod +x resolc-x86_64-unknown-linux-musl
|
||||
chmod +x resolc-universal-apple-darwin
|
||||
|
||||
- name: Create sha-256 checksum
|
||||
run: |
|
||||
shasum -a 256 resolc-x86_64-unknown-linux-musl > checksums.txt
|
||||
shasum -a 256 resolc-universal-apple-darwin >> checksums.txt
|
||||
shasum -a 256 resolc-x86_64-pc-windows-msvc.exe >> checksums.txt
|
||||
shasum -a 256 resolc.js >> checksums.txt
|
||||
shasum -a 256 resolc.wasm >> checksums.txt
|
||||
shasum -a 256 resolc_web.js >> checksums.txt
|
||||
|
||||
- uses: actions/create-github-app-token@v1
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ secrets.REVIVE_RELEASE_APP_ID }}
|
||||
private-key: ${{ secrets.REVIVE_RELEASE_APP_KEY }}
|
||||
|
||||
- name: create-release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
body: |
|
||||
## Changelog
|
||||
${{ needs.check-version-changed.outputs.RELEASE_NOTES }}
|
||||
|
||||
## Note for macOS Users
|
||||
The macOS binary is unsigned and it needs to be made runnable using `xattr -c resolc-universal-apple-darwin`.
|
||||
tag_name: ${{ github.ref_name }}
|
||||
name: ${{ github.ref_name }}
|
||||
prerelease: true
|
||||
token: ${{ steps.app-token.outputs.token }}
|
||||
target_commitish: ${{ github.sha }}
|
||||
files: |
|
||||
resolc-x86_64-unknown-linux-musl
|
||||
resolc-universal-apple-darwin
|
||||
resolc-x86_64-pc-windows-msvc.exe
|
||||
resolc.js
|
||||
resolc.wasm
|
||||
resolc_web.js
|
||||
checksums.txt
|
||||
|
||||
npm-release:
|
||||
needs: [create-release]
|
||||
runs-on: macos-14
|
||||
environment: tags
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Download Artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
merge-multiple: true
|
||||
|
||||
- name: Set Up Node.js
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: "20"
|
||||
|
||||
- run: npm ci -w js/resolc
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cp -f resolc.{wasm,js} js/resolc/src/resolc
|
||||
npm -w js/resolc run build
|
||||
|
||||
- name: npm pack
|
||||
run: npm -w js/resolc pack
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: npm_package
|
||||
path: "parity-resolc-*.tgz"
|
||||
|
||||
- uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
|
||||
with:
|
||||
route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
|
||||
ref: main
|
||||
inputs: '${{ format(''{{ "artifact_name": "npm_package", "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}
|
||||
@@ -0,0 +1,262 @@
|
||||
name: Reusable Build
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
is_release:
|
||||
description: "Whether this is a release build"
|
||||
required: true
|
||||
type: boolean
|
||||
retention_days:
|
||||
description: "Artifact retention days"
|
||||
required: false
|
||||
type: number
|
||||
default: 1
|
||||
outputs:
|
||||
resolc-x86_64-unknown-linux-musl_url:
|
||||
value: ${{ jobs.build.outputs.resolc-x86_64-unknown-linux-musl_url }}
|
||||
resolc-x86_64-unknown-linux-musl_sha:
|
||||
value: ${{ jobs.build.outputs.resolc-x86_64-unknown-linux-musl_sha }}
|
||||
resolc-aarch64-apple-darwin_url:
|
||||
value: ${{ jobs.build.outputs.resolc-aarch64-apple-darwin_url }}
|
||||
resolc-aarch64-apple-darwin_sha:
|
||||
value: ${{ jobs.build.outputs.resolc-aarch64-apple-darwin_sha }}
|
||||
resolc-x86_64-apple-darwin_url:
|
||||
value: ${{ jobs.build.outputs.resolc-x86_64-apple-darwin_url }}
|
||||
resolc-x86_64-apple-darwin_sha:
|
||||
value: ${{ jobs.build.outputs.resolc-x86_64-apple-darwin_sha }}
|
||||
resolc-x86_64-pc-windows-msvc_url:
|
||||
value: ${{ jobs.build.outputs.resolc-x86_64-pc-windows-msvc_url }}
|
||||
resolc-x86_64-pc-windows-msvc_sha:
|
||||
value: ${{ jobs.build.outputs.resolc-x86_64-pc-windows-msvc_sha }}
|
||||
resolc-web_js_url:
|
||||
value: ${{ jobs.build-wasm.outputs.resolc_web_js_url }}
|
||||
resolc-web_js_sha:
|
||||
value: ${{ jobs.build-wasm.outputs.resolc_web_js_sha }}
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
|
||||
|
||||
jobs:
|
||||
build:
|
||||
# github actions matrix jobs don't support multiple outputs
|
||||
# ugly workaround from https://github.com/orgs/community/discussions/17245#discussioncomment-11222880
|
||||
outputs:
|
||||
resolc-x86_64-unknown-linux-musl_url: ${{ steps.set-output.outputs.resolc-x86_64-unknown-linux-musl_url }}
|
||||
resolc-x86_64-unknown-linux-musl_sha: ${{ steps.set-output.outputs.resolc-x86_64-unknown-linux-musl_sha }}
|
||||
resolc-aarch64-apple-darwin_url: ${{ steps.set-output.outputs.resolc-aarch64-apple-darwin_url }}
|
||||
resolc-aarch64-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-aarch64-apple-darwin_sha }}
|
||||
resolc-x86_64-apple-darwin_url: ${{ steps.set-output.outputs.resolc-x86_64-apple-darwin_url }}
|
||||
resolc-x86_64-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-x86_64-apple-darwin_sha }}
|
||||
resolc-x86_64-pc-windows-msvc_url: ${{ steps.set-output.outputs.resolc-x86_64-pc-windows-msvc_url }}
|
||||
resolc-x86_64-pc-windows-msvc_sha: ${{ steps.set-output.outputs.resolc-x86_64-pc-windows-msvc_sha }}
|
||||
strategy:
|
||||
matrix:
|
||||
target:
|
||||
[
|
||||
x86_64-unknown-linux-musl,
|
||||
aarch64-apple-darwin,
|
||||
x86_64-apple-darwin,
|
||||
x86_64-pc-windows-msvc,
|
||||
]
|
||||
include:
|
||||
- target: x86_64-unknown-linux-musl
|
||||
type: musl
|
||||
runner: ubuntu-24.04
|
||||
- target: aarch64-apple-darwin
|
||||
type: native
|
||||
runner: macos-14
|
||||
- target: x86_64-apple-darwin
|
||||
type: native
|
||||
runner: macos-13
|
||||
- target: x86_64-pc-windows-msvc
|
||||
type: native
|
||||
runner: windows-2022
|
||||
runs-on: ${{ matrix.runner }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
rustflags: ""
|
||||
cache-key: ${{ matrix.target }}
|
||||
|
||||
- name: Download LLVM
|
||||
uses: ./.github/actions/get-llvm
|
||||
with:
|
||||
target: ${{ matrix.target }}
|
||||
|
||||
- name: Build (Native)
|
||||
if: ${{ matrix.type == 'native' }}
|
||||
shell: bash
|
||||
run: |
|
||||
export LLVM_SYS_181_PREFIX=$PWD/llvm-${{ matrix.target }}
|
||||
make install-bin
|
||||
mv target/release/resolc resolc-${{ matrix.target }} || mv target/release/resolc.exe resolc-${{ matrix.target }}.exe
|
||||
|
||||
- name: Build (MUSL)
|
||||
if: ${{ matrix.type == 'musl' }}
|
||||
run: |
|
||||
docker run -v $PWD:/opt/revive $RUST_MUSL_CROSS_IMAGE /bin/bash -c "
|
||||
cd /opt/revive
|
||||
chown -R root:root .
|
||||
apt update && apt upgrade -y && apt install -y pkg-config
|
||||
export LLVM_SYS_181_PREFIX=/opt/revive/llvm-${{ matrix.target }}
|
||||
make install-bin
|
||||
mv target/${{ matrix.target }}/release/resolc resolc-${{ matrix.target }}
|
||||
"
|
||||
sudo chown -R $(id -u):$(id -g) .
|
||||
|
||||
- name: Install Solc
|
||||
uses: ./.github/actions/get-solc
|
||||
|
||||
- name: Basic Sanity Check
|
||||
shell: bash
|
||||
run: |
|
||||
result=$(./resolc-${{ matrix.target }} --bin crates/integration/contracts/flipper.sol)
|
||||
echo $result
|
||||
if [[ $result == *'50564d'* ]]; then exit 0; else exit 1; fi
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
id: artifact-upload-step
|
||||
with:
|
||||
name: resolc-${{ matrix.target }}
|
||||
path: resolc-${{ matrix.target }}*
|
||||
retention-days: ${{ inputs.retention_days }}
|
||||
|
||||
- name: Set output variables
|
||||
if: ${{ !inputs.is_release }}
|
||||
id: set-output
|
||||
shell: bash
|
||||
run: |
|
||||
echo "resolc-${{ matrix.target }}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
|
||||
echo "resolc-${{ matrix.target }}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
build-wasm:
|
||||
runs-on: ubuntu-24.04
|
||||
outputs:
|
||||
resolc_web_js_url: ${{ steps.set-output.outputs.resolc_web_js_url }}
|
||||
resolc_web_js_sha: ${{ steps.set-output.outputs.resolc_web_js_sha }}
|
||||
env:
|
||||
RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
target: wasm32-unknown-emscripten
|
||||
rustflags: ""
|
||||
|
||||
- name: Download Host LLVM
|
||||
uses: ./.github/actions/get-llvm
|
||||
with:
|
||||
target: x86_64-unknown-linux-gnu
|
||||
|
||||
- name: Download Wasm LLVM
|
||||
uses: ./.github/actions/get-llvm
|
||||
with:
|
||||
target: wasm32-unknown-emscripten
|
||||
|
||||
- name: Download EMSDK
|
||||
uses: ./.github/actions/get-emsdk
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
export LLVM_SYS_181_PREFIX=$PWD/llvm-x86_64-unknown-linux-gnu
|
||||
export REVIVE_LLVM_TARGET_PREFIX=$PWD/llvm-wasm32-unknown-emscripten
|
||||
source emsdk/emsdk_env.sh
|
||||
make install-wasm
|
||||
chmod -x ./target/wasm32-unknown-emscripten/release/resolc.wasm
|
||||
|
||||
- name: Set Up Node.js
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: "20"
|
||||
|
||||
- name: Basic Sanity Check
|
||||
run: |
|
||||
mkdir -p solc
|
||||
curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
|
||||
node -e "
|
||||
const soljson = require('solc/soljson');
|
||||
const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
|
||||
|
||||
const compiler = createRevive();
|
||||
compiler.soljson = soljson;
|
||||
|
||||
const standardJsonInput =
|
||||
{
|
||||
language: 'Solidity',
|
||||
sources: {
|
||||
'MyContract.sol': {
|
||||
content: 'pragma solidity ^0.8.0; contract MyContract { function greet() public pure returns (string memory) { return \'Hello\'; } }',
|
||||
},
|
||||
},
|
||||
settings: { optimizer: { enabled: false } }
|
||||
};
|
||||
|
||||
compiler.writeToStdin(JSON.stringify(standardJsonInput));
|
||||
compiler.callMain(['--standard-json']);
|
||||
|
||||
const stdout = compiler.readFromStdout();
|
||||
const stderr = compiler.readFromStderr();
|
||||
|
||||
if (stderr) { console.error(stderr); process.exit(1); }
|
||||
|
||||
let out = JSON.parse(stdout);
|
||||
let bytecode = out.contracts['MyContract.sol']['MyContract'].evm.bytecode.object
|
||||
console.log(bytecode);
|
||||
|
||||
if(!bytecode.startsWith('50564d')) { process.exit(1); }
|
||||
"
|
||||
|
||||
- name: Compress Artifact
|
||||
run: |
|
||||
mkdir -p resolc-wasm32-unknown-emscripten
|
||||
mv ./target/wasm32-unknown-emscripten/release/resolc.js ./resolc-wasm32-unknown-emscripten/
|
||||
mv ./target/wasm32-unknown-emscripten/release/resolc.wasm ./resolc-wasm32-unknown-emscripten/
|
||||
mv ./target/wasm32-unknown-emscripten/release/resolc_web.js ./resolc-wasm32-unknown-emscripten/
|
||||
|
||||
- name: Upload artifacts (Release)
|
||||
if: ${{ inputs.is_release }}
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: resolc-wasm32-unknown-emscripten
|
||||
path: resolc-wasm32-unknown-emscripten/*
|
||||
retention-days: ${{ inputs.retention_days }}
|
||||
|
||||
# There is no way to upload several files as several artifacts with a single upload-artifact step
|
||||
# It's needed to have resolc_web.js separately for night builds for resolc-bin repo
|
||||
# https://github.com/actions/upload-artifact/issues/331
|
||||
- name: Upload artifact resolc.js (Nightly)
|
||||
if: ${{ !inputs.is_release }}
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: resolc.js
|
||||
path: resolc-wasm32-unknown-emscripten/resolc.js
|
||||
retention-days: ${{ inputs.retention_days }}
|
||||
|
||||
- name: Upload artifacts resolc.wasm (Nightly)
|
||||
if: ${{ !inputs.is_release }}
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: resolc.wasm
|
||||
path: resolc-wasm32-unknown-emscripten/resolc.wasm
|
||||
retention-days: ${{ inputs.retention_days }}
|
||||
|
||||
- name: Upload artifacts resolc_web.js (Nightly)
|
||||
if: ${{ !inputs.is_release }}
|
||||
uses: actions/upload-artifact@v4
|
||||
id: artifact-upload-step
|
||||
with:
|
||||
name: resolc_web.js
|
||||
path: resolc-wasm32-unknown-emscripten/resolc_web.js
|
||||
retention-days: ${{ inputs.retention_days }}
|
||||
|
||||
- name: Set output variables
|
||||
if: ${{ !inputs.is_release }}
|
||||
id: set-output
|
||||
env:
|
||||
TARGET: resolc_web_js
|
||||
run: |
|
||||
echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
|
||||
echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}" >> "$GITHUB_OUTPUT"
|
||||
@@ -1,55 +0,0 @@
|
||||
name: Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
build-ubuntu-x86:
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install solc
|
||||
run: |
|
||||
mkdir -p solc
|
||||
curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux
|
||||
chmod +x solc/solc
|
||||
echo "$(pwd)/solc/" >> $GITHUB_PATH
|
||||
|
||||
- name: Install LLVM
|
||||
run: |
|
||||
curl -sSL --output llvm.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.4/clang+llvm-18.1.4-x86_64-linux-gnu-ubuntu-18.04.tar.xz
|
||||
tar Jxf llvm.tar.xz
|
||||
mv clang+llvm-18.1.4-x86_64-linux-gnu-ubuntu-18.04 llvm18/
|
||||
echo "$(pwd)/llvm18/bin" >> $GITHUB_PATH
|
||||
|
||||
- name: Install apt dependencies
|
||||
run: |
|
||||
sudo add-apt-repository -y ppa:ethereum/ethereum
|
||||
sudo apt update
|
||||
sudo apt install -y libtinfo5 ethereum
|
||||
|
||||
- name: Format
|
||||
run: make format
|
||||
|
||||
- name: Clippy
|
||||
run: make clippy
|
||||
|
||||
- name: Test cargo workspace
|
||||
run: make test-workspace
|
||||
|
||||
- name: Test CLI
|
||||
run: make test-cli
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ github.job }}-resolc
|
||||
path: ./target/release/resolc
|
||||
retention-days: 1
|
||||
@@ -0,0 +1,47 @@
|
||||
name: Test LLVM Builder
|
||||
on:
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
types: [opened, synchronize]
|
||||
paths:
|
||||
- 'LLVM.lock'
|
||||
- 'crates/llvm-builder/**'
|
||||
- '.github/workflows/test-llvm-builder.yml'
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
test:
|
||||
strategy:
|
||||
matrix:
|
||||
runner: [parity-large, macos-14, windows-2022]
|
||||
runs-on: ${{ matrix.runner }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
# without this it will override our rust flags
|
||||
rustflags: ""
|
||||
cache-key: ${{ matrix.runner }}
|
||||
|
||||
- name: Install Dependencies
|
||||
if: matrix.runner == 'parity-large'
|
||||
run: |
|
||||
sudo apt update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
|
||||
|
||||
- name: Install Dependencies
|
||||
if: matrix.runner == 'macos-14'
|
||||
run: |
|
||||
brew install ninja
|
||||
|
||||
- name: Test
|
||||
run: make test-llvm-builder
|
||||
env:
|
||||
RUST_LOG: trace
|
||||
@@ -0,0 +1,107 @@
|
||||
name: Test Wasm Version
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
types: [opened, synchronize]
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-24.04
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
target: wasm32-unknown-emscripten
|
||||
# without this it will override our rust flags
|
||||
rustflags: ""
|
||||
|
||||
- name: Download Host LLVM
|
||||
uses: ./.github/actions/get-llvm
|
||||
with:
|
||||
target: x86_64-unknown-linux-gnu
|
||||
|
||||
- name: Download Wasm LLVM
|
||||
uses: ./.github/actions/get-llvm
|
||||
with:
|
||||
target: wasm32-unknown-emscripten
|
||||
|
||||
- name: Install emsdk
|
||||
uses: ./.github/actions/get-emsdk
|
||||
|
||||
- name: Set LLVM Environment Variables
|
||||
run: |
|
||||
echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
|
||||
echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/llvm-wasm32-unknown-emscripten" >> $GITHUB_ENV
|
||||
|
||||
- name: Build Revive
|
||||
run: |
|
||||
source emsdk/emsdk_env.sh
|
||||
make install-wasm
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: revive-wasm
|
||||
path: |
|
||||
${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.js
|
||||
${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.wasm
|
||||
${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc_web.js
|
||||
retention-days: 1
|
||||
|
||||
test:
|
||||
needs: build
|
||||
strategy:
|
||||
matrix:
|
||||
os: ["ubuntu-24.04", "macos-14", "windows-2022"]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Create Target Directory
|
||||
run: mkdir -p ${{ env.REVIVE_WASM_INSTALL_DIR }}
|
||||
|
||||
- name: Download Artifact
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: revive-wasm
|
||||
path: ${{ env.REVIVE_WASM_INSTALL_DIR }}
|
||||
|
||||
- name: Set Up Node.js
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: "20"
|
||||
|
||||
- name: Install Node Packages
|
||||
run: npm install
|
||||
|
||||
- name: Test emscripten
|
||||
run: |
|
||||
echo "Running tests for ${{ matrix.os }}"
|
||||
npm run test:wasm
|
||||
|
||||
- name: Test @parity/resolc
|
||||
run: |
|
||||
echo "Running tests for ${{ matrix.os }}"
|
||||
npm run -w js/resolc test
|
||||
|
||||
- name: Run Playwright tests
|
||||
run: |
|
||||
cd js/emscripten
|
||||
npx playwright install --with-deps
|
||||
npx playwright test
|
||||
@@ -0,0 +1,62 @@
|
||||
name: Test
|
||||
on:
|
||||
push:
|
||||
branches: ["main"]
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
pull_request:
|
||||
branches: ["main"]
|
||||
types: [opened, synchronize]
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
# without this it will override our rust flags
|
||||
rustflags: ""
|
||||
components: rustfmt, clippy
|
||||
|
||||
- name: Install Solc
|
||||
uses: ./.github/actions/get-solc
|
||||
|
||||
- name: Download LLVM
|
||||
uses: ./.github/actions/get-llvm
|
||||
with:
|
||||
target: x86_64-unknown-linux-gnu
|
||||
|
||||
- name: Set LLVM Environment Variables
|
||||
run: |
|
||||
echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
|
||||
|
||||
- name: Install Geth
|
||||
run: |
|
||||
sudo add-apt-repository -y ppa:ethereum/ethereum
|
||||
sudo apt update
|
||||
sudo apt install -y ethereum
|
||||
|
||||
- name: Machete
|
||||
uses: bnjbvr/cargo-machete@v0.7.1
|
||||
|
||||
- name: Format
|
||||
run: make format
|
||||
|
||||
- name: Clippy
|
||||
run: make clippy
|
||||
|
||||
- name: Test cargo workspace
|
||||
run: make test-workspace
|
||||
|
||||
- name: Test docs
|
||||
run: make doc
|
||||
+7
-4
@@ -1,4 +1,6 @@
|
||||
/target
|
||||
/js/resolc/dist
|
||||
target-llvm
|
||||
*.dot
|
||||
.vscode/
|
||||
.DS_Store
|
||||
@@ -6,13 +8,14 @@
|
||||
/*.yul
|
||||
/*.ll
|
||||
/*.s
|
||||
/llvm-project
|
||||
/llvm18.0
|
||||
/llvm18.0-emscripten
|
||||
/llvm*
|
||||
node_modules
|
||||
artifacts
|
||||
tmp
|
||||
package-lock.json
|
||||
/*.html
|
||||
/build
|
||||
soljson.js
|
||||
test-results
|
||||
playwright-report
|
||||
.cache
|
||||
emsdk
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"trailingComma": "es5",
|
||||
"tabWidth": 2,
|
||||
"semi": false,
|
||||
"singleQuote": true
|
||||
}
|
||||
+255
-4
@@ -2,31 +2,277 @@
|
||||
|
||||
## Unreleased
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
## v0.4.1
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
### Changed
|
||||
- The `ast` output is no longer pruned in standard JSON mode (required for foundry).
|
||||
- Support `standard_json.output_selection` to also look at per file settings.
|
||||
|
||||
## v0.4.0
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
### Changed
|
||||
- Remove the broken `--llvm-ir` mode.
|
||||
- Remove the unused fallback for size optimization setting.
|
||||
- Unlinked contract binaries are emitted as raw ELF objects.
|
||||
|
||||
### Added
|
||||
- Line debug information per YUL builtin and for `if` statements.
|
||||
- Column numbers in debug information.
|
||||
- Support for the YUL optimizer details in the standard json input definition.
|
||||
- The `revive-explorer` compiler utility.
|
||||
- `revive-yul`: The AST visitor interface.
|
||||
- The `--link` deploy time linking mode.
|
||||
|
||||
### Fixed
|
||||
- The debug info source file matches the YUL path in `--debug-output-dir`, allowing tools to display the source line.
|
||||
- Incosistent type forwarding in JSON output (empty string vs. null object).
|
||||
- The solc automatic import resolution.
|
||||
- Compiler panic on missing libraries definition.
|
||||
|
||||
## v0.3.0
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
### Fixed
|
||||
|
||||
- llvm-context: Bugfix the SAR YUL builtin translation.
|
||||
- runtime-api: Add the missing `memset` builtin.
|
||||
- npm package: Bugfix the exports field defined in the `package.json`.
|
||||
|
||||
|
||||
## v0.2.0
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
### Changed
|
||||
|
||||
- Removed the license printer from the `resolc` binary.
|
||||
- EVM bytecode is no longer requested from solc (except in test utils) leading to less compilation work in the pipeline.
|
||||
|
||||
### Fixed
|
||||
|
||||
- solc-json-interface: Serializing of any custom key in the JSON input is only skipped if not provided.
|
||||
- npm package resolution no longer fails with an 'ERR_PACKAGE_PATH_NOT_EXPORTED' error for packages defining exports fields in the `package.json`.
|
||||
|
||||
## v0.1.0
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `2503.0.1`
|
||||
|
||||
### Added
|
||||
|
||||
- Add the PolkaVM heap size, stack size and debug info CLI compiler options to the standard JSON settings. This makes the standard JSON input succint for reproducible builds.
|
||||
|
||||
### Changed
|
||||
|
||||
- Supported `polkadot-sdk` version is now `2503.0.1`
|
||||
- The `emsdk` version is now `4.0.9`
|
||||
|
||||
### Fixed
|
||||
|
||||
## v0.1.0-dev.16
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
|
||||
|
||||
### Added
|
||||
|
||||
- Move the npm package from paritytech/js-revive, into this repo. The package `@parity/resolc` will be deployed to npm for each release.
|
||||
- Support for solc v0.8.30
|
||||
|
||||
### Changed
|
||||
|
||||
- By default, heavy size optimizations are applied.
|
||||
|
||||
### Fixed
|
||||
|
||||
- @parity/resolc: The solc dependency package is constrained to the latest supported version, preventing breaking the package ever time a new solc package was released.
|
||||
- The resolc npm package no longer ignores the optimizer settings
|
||||
|
||||
## v0.1.0-dev.14
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
|
||||
|
||||
### Added
|
||||
|
||||
- The `revive-runner` helper utility binary which helps to run contracts locally without a blockchain node.
|
||||
- Allow configuration of the EVM heap memory size and stack size via CLI flags and JSON input settings.
|
||||
|
||||
### Changed
|
||||
|
||||
- The default PVM stack memory size was increased from 16kb to 32kb.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Constructors avoid storing zero sized immutable data on exit.
|
||||
|
||||
## v0.1.0-dev.13
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
|
||||
|
||||
### Added
|
||||
|
||||
- Support for solc v0.8.29
|
||||
- Decouples the solc JSON-input-output type definitions from the Solidity fronted and expose them via a dedicated crate.
|
||||
- `--supported-solc-versions` for `resolc` binary to return a `semver` range of supported `solc` versions.
|
||||
- Support for passing LLVM command line options via the prcoess input or providing one or more `--llvm-arg='..'` resolc CLI flag. This allows more fine-grained control over the LLVM backend configuration.
|
||||
|
||||
### Changed
|
||||
|
||||
- Storage keys and values are big endian. This was a pre-mature optimization because for the contract itself it this is a no-op and thus not observable. However we should consider the storage layout as part of the contract ABI. The endianness of transient storage values are still kept as-is.
|
||||
- Running `resolc` using webkit is no longer supported.
|
||||
|
||||
### Fixed
|
||||
|
||||
- A missing byte swap for the create2 salt value.
|
||||
|
||||
## v0.1.0-dev.12
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`
|
||||
|
||||
### Added
|
||||
|
||||
- Per file output selection for `--standard-json` mode.
|
||||
- The `ir` output selection option for `--standard-json` mode.
|
||||
|
||||
### Changed
|
||||
|
||||
- Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).
|
||||
|
||||
### Fixed
|
||||
|
||||
## v0.1.0-dev.11
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
- A bug causing incorrect loads from the emulated EVM linear memory.
|
||||
- A missing integer truncate after switching to 64bit.
|
||||
|
||||
## v0.1.0-dev.10
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
|
||||
|
||||
### Added
|
||||
|
||||
- Support for the `coinbase` opcode.
|
||||
- The resolc web JS version.
|
||||
|
||||
### Changed
|
||||
|
||||
- Missing the `--overwrite` flag emits an error instead of a warning.
|
||||
- The `resolc` executable prints the help by default.
|
||||
- Removed support for legacy EVM assembly (EVMLA) translation.
|
||||
- integration: identify cached code blobs on source code to fix potential confusions.
|
||||
- Setting base, include or allow paths in emscripten is now a hard error.
|
||||
- Employ a heuristic to detect `address.transfer` and `address.send` calls.
|
||||
If detected, the re-entrant call flag is not set and 0 deposit limit is endowed.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Solidity: Add the solc `--libraries` files to sources.
|
||||
- A data race in tests.
|
||||
- Fix `broken pipe` errors.
|
||||
- llvm-builder: Allow warnings.
|
||||
- solidity: Fix the custom compiler warning messages.
|
||||
|
||||
## v0.1.0-dev.9
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
### Added
|
||||
|
||||
### Changed
|
||||
|
||||
- Syscalls with more than 6 arguments now pack them into registers.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Remove reloading of the resolc.js file (fix issue with relative path in web worker)
|
||||
|
||||
## v0.1.0-dev.8
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
### Added
|
||||
|
||||
- The `revive-llvm-builder` crate with the `revive-llvm` helper utility for streamlined management of the LLVM framework dependency.
|
||||
- Initial support for running `resolc` in the browser.
|
||||
|
||||
### Changed
|
||||
|
||||
- Suported contracts runtime is polkadot-sdk git version `d62a90c8c729acd98c7e9a5cab9803b8b211ffc5`.
|
||||
- The minimum supported Rust version is `1.81.0`.
|
||||
- Error out early instead of invoking `solc` with invalid base or include path flags.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Decouple the LLVM target dependency from the LLVM host dependency.
|
||||
- Do not error out if no files and no errors were produced. This aligns resolc closer to solc.
|
||||
- Fixes input normalization in the Wasm version.
|
||||
|
||||
## v0.1.0-dev.7
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
### Added
|
||||
|
||||
- Implement the `GASPRICE` opcode.
|
||||
- Implement the `BASEFEE` opcode.
|
||||
- Implement the `GASLIMIT` opcode.
|
||||
|
||||
### Changed
|
||||
|
||||
- The `GAS` opcode now returns the remaining `ref_time`.
|
||||
- Contracts can now be supplied call data input of arbitrary size.
|
||||
- Some syscalls now return the value in a register, slightly improving emitted contract code.
|
||||
- Some syscalls now return the value in a register, slightly improving emitted contract code.
|
||||
- Calls forward maximum weight limits instead of 0, anticipating a change in polkadot-sdk where weight limits of 0 no longer interprets as uncapped limit.
|
||||
|
||||
### Fixed
|
||||
- A linker bug which was preventing certain contracts from linking with the PVM linker.
|
||||
|
||||
- A linker bug which was preventing certain contracts from linking with the PVM linker.
|
||||
- JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
|
||||
- The git commit hash slug is always displayed in the version string.
|
||||
- The git commit hash slug is always displayed in the version string.
|
||||
|
||||
## v0.1.0-dev.6
|
||||
|
||||
This is a development pre-release.
|
||||
|
||||
# Added
|
||||
|
||||
- Implement the `BLOCKHASH` opcode.
|
||||
- Implement delegate calls.
|
||||
- Implement the `GASPRICE` opcode. Currently hard-coded to return `1`.
|
||||
@@ -34,21 +280,24 @@ This is a development pre-release.
|
||||
- Initial support for emitting debug info (opt in via the `-g` flag)
|
||||
|
||||
# Changed
|
||||
|
||||
- resolc now emits 64bit PolkaVM blobs, reducing contract code size and execution time.
|
||||
- The RISC-V bit-manipulation target feature (`zbb`) is enabled.
|
||||
|
||||
# Fixed
|
||||
- Compilation to Wasm (for usage in node and web browsers)
|
||||
|
||||
- Compilation to Wasm (for usage in node and web browsers)
|
||||
|
||||
## v0.1.0-dev.5
|
||||
|
||||
This is development pre-release.
|
||||
|
||||
# Added
|
||||
|
||||
- Implement the `CODESIZE` and `EXTCODESIZE` opcodes.
|
||||
|
||||
# Changed
|
||||
|
||||
- Include the full revive version in the contract metadata.
|
||||
|
||||
# Fixed
|
||||
@@ -58,9 +307,11 @@ This is development pre-release.
|
||||
This is development pre-release.
|
||||
|
||||
# Added
|
||||
|
||||
- Support the `ORIGIN` opcode.
|
||||
|
||||
# Changed
|
||||
|
||||
- Update polkavm to `v0.14.0`.
|
||||
- Enable the `a`, `fast-unaligned-access` and `xtheadcondmov` LLVM target features, decreasing the code size for some contracts.
|
||||
|
||||
|
||||
Generated
+3505
-2373
File diff suppressed because it is too large
Load Diff
+59
-52
@@ -3,7 +3,7 @@ resolver = "2"
|
||||
members = ["crates/*"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.0-dev.7"
|
||||
version = "0.1.0"
|
||||
authors = [
|
||||
"Cyrill Leutwiler <cyrill@parity.io>",
|
||||
"Parity Technologies <admin@parity.io>",
|
||||
@@ -11,71 +11,78 @@ authors = [
|
||||
license = "MIT/Apache-2.0"
|
||||
edition = "2021"
|
||||
repository = "https://github.com/paritytech/revive"
|
||||
rust-version = "1.80.0"
|
||||
rust-version = "1.85.0"
|
||||
|
||||
[workspace.dependencies]
|
||||
revive-benchmarks = { version = "0.1.0-dev.7", path = "crates/benchmarks" }
|
||||
revive-builtins = { version = "0.1.0-dev.7", path = "crates/builtins" }
|
||||
revive-common = { version = "0.1.0-dev.7", path = "crates/common" }
|
||||
revive-differential = { version = "0.1.0-dev.7", path = "crates/differential" }
|
||||
revive-integration = { version = "0.1.0-dev.7", path = "crates/integration" }
|
||||
revive-linker = { version = "0.1.0-dev.7", path = "crates/linker" }
|
||||
lld-sys = { version = "0.1.0-dev.7", path = "crates/lld-sys" }
|
||||
revive-llvm-context = { version = "0.1.0-dev.7", path = "crates/llvm-context" }
|
||||
revive-runtime-api = { version = "0.1.0-dev.7", path = "crates/runtime-api" }
|
||||
revive-runner = { version = "0.1.0-dev.7", path = "crates/runner" }
|
||||
revive-solidity = { version = "0.1.0-dev.7", path = "crates/solidity" }
|
||||
revive-stdlib = { version = "0.1.0-dev.7", path = "crates/stdlib" }
|
||||
lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
|
||||
resolc = { version = "0.4.0", path = "crates/resolc", default-features = false }
|
||||
revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
|
||||
revive-build-utils = { version = "0.2.0", path = "crates/build-utils" }
|
||||
revive-builtins = { version = "0.1.0", path = "crates/builtins" }
|
||||
revive-common = { version = "0.2.1", path = "crates/common" }
|
||||
revive-differential = { version = "0.2.0", path = "crates/differential" }
|
||||
revive-explorer = { version = "0.1.0", path = "crates/explore" }
|
||||
revive-integration = { version = "0.2.0", path = "crates/integration" }
|
||||
revive-linker = { version = "0.2.0", path = "crates/linker" }
|
||||
revive-llvm-context = { version = "0.4.1", path = "crates/llvm-context" }
|
||||
revive-runner = { version = "0.2.0", path = "crates/runner" }
|
||||
revive-runtime-api = { version = "0.3.0", path = "crates/runtime-api" }
|
||||
revive-solc-json-interface = { version = "0.4.0", path = "crates/solc-json-interface", default-features = false }
|
||||
revive-stdlib = { version = "0.2.0", path = "crates/stdlib" }
|
||||
revive-yul = { version = "0.3.1", path = "crates/yul" }
|
||||
|
||||
hex = "0.4"
|
||||
petgraph = "0.6"
|
||||
cc = "1.0"
|
||||
libc = "0.2"
|
||||
tempfile = "3.8"
|
||||
hex = "0.4.3"
|
||||
cc = "1.2"
|
||||
libc = "0.2.172"
|
||||
tempfile = "3.20"
|
||||
anyhow = "1.0"
|
||||
semver = { version = "1.0", features = [ "serde" ] }
|
||||
itertools = "0.12"
|
||||
serde = { version = "1.0", features = [ "derive" ] }
|
||||
serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }
|
||||
regex = "1.10"
|
||||
once_cell = "1.19"
|
||||
num = "0.4"
|
||||
semver = { version = "1.0", features = ["serde"] }
|
||||
itertools = "0.14"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = { version = "1.0", features = ["arbitrary_precision"] }
|
||||
regex = "1.11"
|
||||
once_cell = "1.21"
|
||||
num = "0.4.3"
|
||||
sha1 = "0.10"
|
||||
sha2 = "0.10"
|
||||
sha3 = "0.10"
|
||||
md5 = "0.7"
|
||||
colored = "2.1"
|
||||
thiserror = "1.0"
|
||||
which = "5.0"
|
||||
thiserror = "2.0"
|
||||
which = "7.0"
|
||||
path-slash = "0.2"
|
||||
rayon = "1.8"
|
||||
rayon = "1.10"
|
||||
clap = { version = "4", default-features = false, features = ["derive"] }
|
||||
rand = "0.8"
|
||||
polkavm-common = "0.18"
|
||||
polkavm-linker = "0.18"
|
||||
polkavm-disassembler = "0.18"
|
||||
polkavm = "0.18"
|
||||
alloy-primitives = { version = "0.8", features = ["serde"] }
|
||||
alloy-sol-types = "0.8"
|
||||
alloy-genesis = "0.3"
|
||||
alloy-serde = "0.3"
|
||||
env_logger = { version = "0.10.0", default-features = false }
|
||||
serde_stacker = "0.1"
|
||||
criterion = { version = "0.5", features = ["html_reports"] }
|
||||
log = { version = "0.4" }
|
||||
git2 = "0.19.0"
|
||||
polkavm-common = "0.24.0"
|
||||
polkavm-linker = "0.24.0"
|
||||
polkavm-disassembler = "0.24.0"
|
||||
polkavm = "0.24.0"
|
||||
alloy-primitives = { version = "1.1", features = ["serde"] }
|
||||
alloy-sol-types = "1.1"
|
||||
alloy-genesis = "1.0"
|
||||
alloy-serde = "1.0"
|
||||
env_logger = { version = "0.11.8", default-features = false }
|
||||
serde_stacker = "0.1.12"
|
||||
criterion = { version = "0.6", features = ["html_reports"] }
|
||||
log = { version = "0.4.27" }
|
||||
git2 = { version = "0.20.2", default-features = false }
|
||||
downloader = "0.2.8"
|
||||
flate2 = "1.1"
|
||||
fs_extra = "1.3"
|
||||
num_cpus = "1"
|
||||
tar = "0.4"
|
||||
toml = "0.8"
|
||||
assert_cmd = "2.0"
|
||||
assert_fs = "1.1"
|
||||
normpath = "1.3"
|
||||
|
||||
# polkadot-sdk and friends
|
||||
codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
|
||||
scale-info = { version = "2.11.1", default-features = false }
|
||||
polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "243b751abbb94369bbd92c83d8ab159ddfc3c556" }
|
||||
codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
|
||||
scale-info = { version = "2.11.6", default-features = false }
|
||||
polkadot-sdk = { version = "2503.0.1" }
|
||||
|
||||
# llvm
|
||||
[workspace.dependencies.inkwell]
|
||||
git = "https://github.com/TheDan64/inkwell.git"
|
||||
rev = "7b410298b6a93450adaa90b1841d5805a3038f12"
|
||||
version = "0.6.0"
|
||||
default-features = false
|
||||
features = ["serde", "llvm18-0", "no-libffi-linking", "target-riscv"]
|
||||
features = ["serde", "llvm18-1", "no-libffi-linking", "target-riscv"]
|
||||
|
||||
[profile.bench]
|
||||
inherits = "release"
|
||||
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
FROM rust:1.85.0 AS llvm-builder
|
||||
WORKDIR /opt/revive
|
||||
|
||||
RUN apt update && \
|
||||
apt upgrade -y && \
|
||||
apt install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
|
||||
|
||||
COPY . .
|
||||
|
||||
RUN make install-llvm-builder
|
||||
RUN revive-llvm --target-env musl clone
|
||||
RUN revive-llvm --target-env musl build --llvm-projects lld --llvm-projects clang
|
||||
|
||||
FROM messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067 AS resolc-builder
|
||||
WORKDIR /opt/revive
|
||||
|
||||
RUN apt update && \
|
||||
apt upgrade -y && \
|
||||
apt install -y pkg-config
|
||||
|
||||
COPY . .
|
||||
COPY --from=llvm-builder /opt/revive/target-llvm /opt/revive/target-llvm
|
||||
|
||||
ENV LLVM_SYS_181_PREFIX=/opt/revive/target-llvm/musl/target-final
|
||||
RUN make install-bin
|
||||
|
||||
FROM alpine:latest
|
||||
ADD https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux /usr/bin/solc
|
||||
COPY --from=resolc-builder /root/.cargo/bin/resolc /usr/bin/resolc
|
||||
|
||||
RUN apk add --no-cache libc6-compat
|
||||
RUN chmod +x /usr/bin/solc
|
||||
@@ -0,0 +1,3 @@
|
||||
url = "https://github.com/llvm/llvm-project.git"
|
||||
branch = "release/18.x"
|
||||
ref = "3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff"
|
||||
@@ -1,60 +1,86 @@
|
||||
.PHONY: install format test test-solidity test-cli test-integration test-workspace clean docs docs-build
|
||||
|
||||
RUSTFLAGS_EMSCRIPTEN := \
|
||||
-C link-arg=-sEXPORTED_FUNCTIONS=_main,_free,_malloc \
|
||||
-C link-arg=-sNO_INVOKE_RUN=1 \
|
||||
-C link-arg=-sEXIT_RUNTIME=1 \
|
||||
-C link-arg=-sALLOW_MEMORY_GROWTH=1 \
|
||||
-C link-arg=-sEXPORTED_RUNTIME_METHODS=FS,callMain,stringToNewUTF8 \
|
||||
-C link-arg=-sMODULARIZE=1 \
|
||||
-C link-arg=-sEXPORT_NAME=createRevive \
|
||||
-C link-arg=-sWASM_ASYNC_COMPILATION=0 \
|
||||
-C link-arg=-sDYNAMIC_EXECUTION=0 \
|
||||
-C link-arg=-sALLOW_TABLE_GROWTH=1 \
|
||||
-C link-arg=--js-library=js/embed/soljson_interface.js \
|
||||
-C link-arg=--pre-js=js/embed/pre.js \
|
||||
-C link-arg=-sNODEJS_CATCH_EXIT=0 \
|
||||
-C link-arg=-sDISABLE_EXCEPTION_CATCHING=0 \
|
||||
-C opt-level=3
|
||||
.PHONY: \
|
||||
install \
|
||||
install-bin \
|
||||
install-npm \
|
||||
install-wasm \
|
||||
install-llvm-builder \
|
||||
install-llvm \
|
||||
install-revive-runner \
|
||||
install-revive-explorer \
|
||||
format \
|
||||
clippy \
|
||||
doc \
|
||||
machete \
|
||||
test \
|
||||
test-integration \
|
||||
test-resolc \
|
||||
test-workspace \
|
||||
test-wasm \
|
||||
test-llvm-builder
|
||||
bench \
|
||||
bench-pvm \
|
||||
bench-evm \
|
||||
clean
|
||||
|
||||
install: install-bin install-npm
|
||||
|
||||
install-bin:
|
||||
cargo install --path crates/solidity
|
||||
cargo install --force --locked --path crates/resolc
|
||||
|
||||
install-npm:
|
||||
npm install && npm fund
|
||||
|
||||
install-wasm:
|
||||
RUSTFLAGS='$(RUSTFLAGS_EMSCRIPTEN)' cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features
|
||||
npm install
|
||||
install-wasm: install-npm
|
||||
cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
|
||||
npm run build:package
|
||||
|
||||
# install-revive: Build and install to the directory specified in REVIVE_INSTALL_DIR
|
||||
ifeq ($(origin REVIVE_INSTALL_DIR), undefined)
|
||||
REVIVE_INSTALL_DIR=`pwd`/release/revive-debian
|
||||
endif
|
||||
install-revive:
|
||||
cargo install --path crates/solidity --root $(REVIVE_INSTALL_DIR)
|
||||
install-llvm-builder:
|
||||
cargo install --force --locked --path crates/llvm-builder
|
||||
|
||||
install-llvm: install-llvm-builder
|
||||
revive-llvm clone
|
||||
revive-llvm build --llvm-projects lld --llvm-projects clang
|
||||
|
||||
install-revive-runner:
|
||||
cargo install --locked --force --path crates/runner --no-default-features
|
||||
|
||||
install-revive-explorer:
|
||||
cargo install --locked --force --path crates/explorer --no-default-features
|
||||
|
||||
format:
|
||||
cargo fmt --all --check
|
||||
|
||||
clippy:
|
||||
cargo clippy --all-features --workspace --tests --benches -- --deny warnings --allow dead_code
|
||||
cargo clippy --all-features --workspace --tests --benches -- --deny warnings
|
||||
|
||||
test: format clippy test-cli test-workspace
|
||||
doc:
|
||||
cargo doc --all-features --workspace --document-private-items --no-deps
|
||||
|
||||
machete:
|
||||
cargo install cargo-machete
|
||||
cargo machete
|
||||
|
||||
test: format clippy machete test-workspace install-revive-runner install-revive-explorer doc
|
||||
|
||||
test-integration: install-bin
|
||||
cargo test --package revive-integration
|
||||
|
||||
test-solidity: install
|
||||
cargo test --package revive-solidity
|
||||
test-resolc: install
|
||||
cargo test --package resolc
|
||||
|
||||
test-workspace: install
|
||||
cargo test --workspace
|
||||
cargo test --workspace --exclude revive-llvm-builder
|
||||
|
||||
test-cli: install
|
||||
npm run test:cli
|
||||
test-wasm: install-wasm
|
||||
npm run test:wasm
|
||||
|
||||
test-llvm-builder:
|
||||
@echo "warning: the llvm-builder tests will take many hours"
|
||||
cargo test --package revive-llvm-builder -- --test-threads=1
|
||||
|
||||
bench: install-bin
|
||||
cargo criterion --all --all-features --message-format=json \
|
||||
| criterion-table > crates/benchmarks/BENCHMARKS.md
|
||||
|
||||
bench-pvm: install-bin
|
||||
cargo criterion --bench execute --features bench-pvm-interpreter --message-format=json \
|
||||
@@ -64,21 +90,10 @@ bench-evm: install-bin
|
||||
cargo criterion --bench execute --features bench-evm --message-format=json \
|
||||
| criterion-table > crates/benchmarks/EVM.md
|
||||
|
||||
bench: install-bin
|
||||
cargo criterion --all --all-features --message-format=json \
|
||||
| criterion-table > crates/benchmarks/BENCHMARKS.md
|
||||
|
||||
docs: docs-build
|
||||
mdbook serve --open docs/
|
||||
|
||||
docs-build:
|
||||
mdbook test docs/ && mdbook build docs/
|
||||
|
||||
clean:
|
||||
cargo clean ; \
|
||||
revive-llvm clean ; \
|
||||
rm -rf node_modules ; \
|
||||
rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
|
||||
cargo uninstall revive-solidity ; \
|
||||
rm -f package-lock.json ; \
|
||||
rm -rf js/dist ; \
|
||||
rm -f js/src/resolc.{wasm,js}
|
||||
rm -rf crates/resolc/src/tests/cli/artifacts ; \
|
||||
cargo uninstall resolc ; \
|
||||
cargo uninstall revive-llvm-builder ;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||

|
||||
[](https://contracts.polkadot.io)
|
||||

|
||||
[](https://contracts.polkadot.io/revive_compiler/)
|
||||
|
||||
# revive
|
||||
|
||||
YUL and EVM assembly recompiler to LLVM, targetting RISC-V on [PolkaVM](https://github.com/koute/polkavm).
|
||||
YUL recompiler to LLVM, targetting RISC-V on [PolkaVM](https://github.com/koute/polkavm).
|
||||
|
||||
Visit [contracts.polkadot.io](https://contracts.polkadot.io) to learn more about contracts on Polkadot!
|
||||
|
||||
@@ -14,58 +14,131 @@ This is experimental software in active development and not ready just yet for p
|
||||
Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).
|
||||
|
||||
## Installation
|
||||
Building Solidity contracts for PolkaVM requires installing the following two compilers:
|
||||
- `resolc`: The revive Solidity compiler YUL frontend and PolkaVM code generator (provided by this repository).
|
||||
- `solc`: The [Ethereum Solidity reference compiler](https://github.com/ethereum/solidity/) implemenation.`resolc` uses `solc` during the compilation process, please refer to the [Ethereum Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html) for installation instructions.
|
||||
|
||||
`resolc` depends on the [solc](https://github.com/ethereum/solidity) binary installed on your system.
|
||||
### `resolc` binary releases
|
||||
`resolc` is distributed as a standalone binary (with `solc` as the only external dependency). Please download one of our [binary releases](https://github.com/paritytech/revive/releases) for your target platform and mind the platform specific instructions below.
|
||||
|
||||
Building from source requires a compatible LLVM build.
|
||||
<details>
|
||||
<summary>MacOS users</summary>
|
||||
|
||||
> **MacOS** users need to clear the `downloaded` attribute from the binary and set the executable flag.
|
||||
> ```sh
|
||||
> xattr -rc resolc-universal-apple-darwin
|
||||
> chmod +x resolc-universal-apple-darwin
|
||||
> ```
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>Linux users</summary>
|
||||
|
||||
> **Linux** users need to set the executable flag.
|
||||
> ```sh
|
||||
> chmod +x resolc-x86_64-unknown-linux-musl
|
||||
> ```
|
||||
|
||||
</details>
|
||||
|
||||
|
||||
### `resolc` NPM package
|
||||
We distribute the revive compiler as [node.js module](https://www.npmjs.com/package/@parity/resolc) and [hardhat plugin](https://www.npmjs.com/package/@parity/hardhat-polkadot-resolc).
|
||||
|
||||
Note: The `solc` dependency is bundled via NPM packaging and defaults to the latest supported version.
|
||||
|
||||
## Building from source
|
||||
|
||||
Building revive requires a [stable Rust installation](https://rustup.rs/) and a C++ toolchain for building [LLVM](https://github.com/llvm/llvm-project) on your system.
|
||||
|
||||
### LLVM
|
||||
|
||||
`revive` requires a build of LLVM 18.1.4 or later with the RISC-V _embedded_ target, including `compiler-rt`. Use the provided [build-llvm.sh](build-llvm.sh) build script to compile a compatible LLVM build locally in `$PWD/llvm18.0` (don't forget to add that to `$PATH` afterwards).
|
||||
`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. You can either download a build from our releases (recommended for older hardware) or build it from source.
|
||||
|
||||
<details>
|
||||
<summary>Download from our LLVM releases</summary>
|
||||
|
||||
Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.
|
||||
|
||||
> **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
|
||||
> ```sh
|
||||
> xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
|
||||
> ```
|
||||
|
||||
After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
|
||||
```sh
|
||||
export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>Building from source</summary>
|
||||
|
||||
The `Makefile` provides a shortcut target to obtain a compatible LLVM build, using the provided [revive-llvm](crates/llvm-builder/README.md) utility. Once installed, point `$LLVM_SYS_181_PREFIX` to the installation afterwards:
|
||||
|
||||
```sh
|
||||
make install-llvm
|
||||
export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
### The `resolc` Solidity frontend
|
||||
|
||||
To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
|
||||
|
||||
To install the `resolc` Solidity frontend executable:
|
||||
|
||||
```bash
|
||||
bash build-llvm.sh
|
||||
export PATH=${PWD}/llvm18.0/bin:$PATH
|
||||
```sh
|
||||
make install-bin
|
||||
resolc --version
|
||||
```
|
||||
### Cross-compilation to WASM
|
||||
|
||||
Cross-compiles the Revive compiler to WASM for running it in a Node.js or browser environment.
|
||||
### Cross-compilation to Wasm
|
||||
|
||||
Install [emscripten](https://emscripten.org/docs/getting_started/downloads.html). Tested on version 3.1.64.
|
||||
To build resolc.js execute:
|
||||
Cross-compile the `resolc.js` frontend executable to Wasm for running it in a Node.js or browser environment. The `REVIVE_LLVM_TARGET_PREFIX` environment variable is used to control the target environment LLVM dependency.
|
||||
|
||||
```bash
|
||||
bash build-llvm.sh
|
||||
export PATH=${PWD}/llvm18.0/bin:$PATH
|
||||
export EMSDK_ROOT=<PATH_TO_EMSCRIPTEN_SDK>
|
||||
bash emscripten-build-llvm.sh
|
||||
source $EMSDK_ROOT/emsdk_env.sh
|
||||
export LLVM_LINK_PREFIX=${PWD}/llvm18.0-emscripten
|
||||
export PATH=$PATH:$PWD/llvm18.0-emscripten/bin/
|
||||
<details>
|
||||
<summary>Instructions for cross-compilation to wasm32-unknown-emscripten</summary>
|
||||
|
||||
```sh
|
||||
# Build the host LLVM dependency with PolkaVM target support
|
||||
make install-llvm
|
||||
export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
|
||||
|
||||
# Build the target LLVM dependency with PolkaVM target support
|
||||
revive-llvm --target-env emscripten clone
|
||||
source emsdk/emsdk_env.sh
|
||||
revive-llvm --target-env emscripten build --llvm-projects lld
|
||||
export REVIVE_LLVM_TARGET_PREFIX=${PWD}/target-llvm/emscripten/target-final
|
||||
|
||||
# Build the resolc frontend executable
|
||||
make install-wasm
|
||||
make test-wasm
|
||||
```
|
||||
|
||||
### Development
|
||||
</details>
|
||||
|
||||
## Development
|
||||
|
||||
Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks.
|
||||
Ensure that your branch passes `make test` locally when submitting a pull request.
|
||||
|
||||
## Design overview
|
||||
### Design overview
|
||||
See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works.
|
||||
|
||||
`revive` uses [solc](https://github.com/ethereum/solidity/), the Ethereum Solidity compiler, as the [Solidity frontend](crates/solidity/src/lib.rs) to process smart contracts written in Solidity. The YUL IR code (or legacy EVM assembly as a fallback for older `solc` versions) emitted by `solc` is then translated to LLVM IR, targetting [Polkadots `revive` pallet](https://docs.rs/pallet-revive/latest/pallet_revive/trait.SyscallDoc.html).
|
||||
[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc`.
|
||||
|
||||
## Tests
|
||||
### Tests
|
||||
|
||||
Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
|
||||
Once Geth is installed, you can run the tests using the following command:
|
||||
|
||||
```bash
|
||||
```sh
|
||||
make test
|
||||
```
|
||||
# Acknowledgements
|
||||
|
||||
The revive compiler project, after some early experiments with EVM bytecode translations, decided to fork the `era-compiler` framework.
|
||||
[Frontend](https://github.com/matter-labs/era-compiler-solidity), [code generator](https://github.com/matter-labs/era-compiler-llvm-context) and some supporting libraries are based of ZKSync `zksolc`. I'd like to express my gratitude and thank the original authors for providing a useable code base under a generous license.
|
||||
|
||||
|
||||
+23
-6
@@ -4,9 +4,26 @@ Prior to the first stable release we neither have formal release processes nor d
|
||||
|
||||
To create a new pre-release:
|
||||
|
||||
1. Merge a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly
|
||||
2. Push a release tag to `main`
|
||||
3. Manually trigger the `Build revive-debian` action
|
||||
4. Create a __pre-release__ from the tag and manually upload the build artifact generated by the action
|
||||
5. Manually upload `resolc.js` and `resolc.wasm` from the `build-revive-wasm` action artifacts.
|
||||
6. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
|
||||
1. Create a release PR which, if necessary:
|
||||
- Updates the versions in the workspace `Cargo.toml`
|
||||
- Updates the version in each crate `Cargo.toml`
|
||||
- Updates the version of the NPM package in `js/resolc/package.json`
|
||||
- Updates the `CHANGELOG.md` to reflect all observable changes
|
||||
2. If the CI passes, merge the release PR.
|
||||
3. Push a `vX.Y.Z` tag that has the same version as in `Cargo.toml`
|
||||
4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
|
||||
5. Wait for the `Release` workflow to finish. It should create the pre-release with the same name.
|
||||
6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
|
||||
7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
|
||||
8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
|
||||
|
||||
# `resolc` NPM package release
|
||||
|
||||
Will happen automatically.
|
||||
|
||||
# LLVM release
|
||||
|
||||
To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.
|
||||
Version suffix will be resolved automatically.
|
||||
The workflows will create new GitHub release, and upload LLVM binaries.
|
||||
Next release of resolc will use newly created binaries.
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/SECURITY.md
|
||||
@@ -1,30 +0,0 @@
|
||||
# Known issues
|
||||
|
||||
The following is known and we are either working on it or it is a hard limitation. Please do not open a new issue.
|
||||
|
||||
## Release
|
||||
|
||||
`0.1.0-dev-2`
|
||||
|
||||
## Missing features
|
||||
|
||||
- [Libraries with public functions are not supported](https://github.com/paritytech/revive/issues/91)
|
||||
- [Automatic import resolution is not supported](https://github.com/paritytech/revive/issues/98)
|
||||
- The emulated EVM linear contract memory is limited to 64kb in size. Will be fixed with support for metered dynamic memory.
|
||||
- [The contract calldata is currently limited to 1kb in size](https://github.com/paritytech/revive/issues/57)
|
||||
- [EIP-4844 opcodes are not supported](https://github.com/paritytech/revive/issues/64)
|
||||
- [Delegate calls are not supported](https://github.com/paritytech/revive/issues/67)
|
||||
- [The `blockhash` opcode is not supported](https://github.com/paritytech/revive/issues/61)
|
||||
- [The `extcodesize` opcode is not supported](https://github.com/paritytech/revive/issues/58)
|
||||
- [The `origin` opcode is not supported](https://github.com/paritytech/revive/issues/59)
|
||||
- [Gas limits for contract calls are ignored](https://github.com/paritytech/revive/issues/60)
|
||||
- [Gas related opcodes are not supported](https://github.com/paritytech/revive/issues/60)
|
||||
- IPFS metadata hashes are not supported
|
||||
- [Compiled contract artifacts can exceed the pallet static memory limit and fail to deploy](https://github.com/paritytech/revive/issues/96).
|
||||
- [Transfers to inexistant accounts will fail if the transferred value lies below the ED.](https://github.com/paritytech/revive/issues/83) Will be fixed in the pallet to make the ED completely transparent for contracts.
|
||||
|
||||
## Wontfix
|
||||
|
||||
Please consult our documentation to learn more about Solidity and EVM features likely to remain unsupported (and why they will not be supported).
|
||||
|
||||
TODO: Insert link to the relevant documentation section.
|
||||
@@ -1,88 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
INSTALL_DIR="${PWD}/llvm18.0"
|
||||
mkdir -p ${INSTALL_DIR}
|
||||
|
||||
# Build LLVM, clang
|
||||
LLVM_SRC_PREFIX=${PWD}/llvm-project
|
||||
LLVM_SRC_DIR=${LLVM_SRC_PREFIX}/llvm
|
||||
LLVM_BUILD_DIR=${PWD}/build/llvm
|
||||
|
||||
./clone-llvm.sh "${LLVM_SRC_PREFIX}"
|
||||
|
||||
if [ ! -d ${LLVM_BUILD_DIR} ] ; then
|
||||
mkdir -p ${LLVM_BUILD_DIR}
|
||||
fi
|
||||
|
||||
cmake -G Ninja \
|
||||
-S ${LLVM_SRC_DIR} \
|
||||
-B ${LLVM_BUILD_DIR} \
|
||||
-DLLVM_ENABLE_ASSERTIONS=On \
|
||||
-DLLVM_ENABLE_TERMINFO=Off \
|
||||
-DLLVM_ENABLE_LIBXML2=Off \
|
||||
-DLLVM_ENABLE_ZLIB=Off \
|
||||
-DLLVM_ENABLE_PROJECTS='clang;lld' \
|
||||
-DLLVM_TARGETS_TO_BUILD='RISCV' \
|
||||
-DLLVM_ENABLE_ZSTD=Off \
|
||||
-DCMAKE_BUILD_TYPE=MinSizeRel \
|
||||
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
|
||||
|
||||
cmake --build ${LLVM_BUILD_DIR}
|
||||
cmake --install ${LLVM_BUILD_DIR}
|
||||
|
||||
# Build compiler builtins
|
||||
COMPILER_RT_SRC_DIR=${LLVM_SRC_PREFIX}/compiler-rt
|
||||
COMPILER_RT_BUILD_DIR=${PWD}/build/compiler-rt
|
||||
if [ ! -d ${COMPILER_RT_BUILD_DIR} ] ; then
|
||||
mkdir -p ${COMPILER_RT_BUILD_DIR}
|
||||
fi
|
||||
|
||||
build_compiler_rt() {
|
||||
case "$1" in
|
||||
64) TARGET_ABI=lp64e ;;
|
||||
32) TARGET_ABI=ilp32e ;;
|
||||
*) exit -1
|
||||
esac
|
||||
CFLAGS="--target=riscv${1} -march=rv${1}em -mabi=${TARGET_ABI} -mcpu=generic-rv${1} -nostdlib -nodefaultlibs"
|
||||
|
||||
cmake -G Ninja \
|
||||
-S ${COMPILER_RT_SRC_DIR} \
|
||||
-B ${COMPILER_RT_BUILD_DIR} \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
|
||||
-DCOMPILER_RT_BUILD_BUILTINS=ON \
|
||||
-DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
|
||||
-DCOMPILER_RT_BUILD_MEMPROF=OFF \
|
||||
-DCOMPILER_RT_BUILD_PROFILE=OFF \
|
||||
-DCOMPILER_RT_BUILD_SANITIZERS=OFF \
|
||||
-DCOMPILER_RT_BUILD_XRAY=OFF \
|
||||
-DCMAKE_C_COMPILER=${INSTALL_DIR}/bin/clang \
|
||||
-DCMAKE_C_COMPILER_TARGET=riscv${1} \
|
||||
-DCMAKE_ASM_COMPILER_TARGET=riscv${1} \
|
||||
-DCMAKE_CXX_COMPILER_TARGET=riscv${1} \
|
||||
-DCMAKE_C_TARGET_BITS=riscv${1} \
|
||||
-DCMAKE_ASM_TARGET_BITS=riscv${1} \
|
||||
-DCMAKE_AR=${INSTALL_DIR}/bin/llvm-ar \
|
||||
-DCMAKE_NM=${INSTALL_DIR}/bin/llvm-nm \
|
||||
-DCMAKE_RANLIB=${INSTALL_DIR}/bin/llvm-ranlib \
|
||||
-DCOMPILER_RT_BAREMETAL_BUILD=ON \
|
||||
-DLLVM_CONFIG_PATH=${INSTALL_DIR}/bin/llvm-config \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_ASM_FLAGS="${CFLAGS}" \
|
||||
-DCOMPILER_RT_TEST_COMPILER=${INSTALL_DIR}/bin/clang \
|
||||
-DCMAKE_CXX_FLAGS="${CFLAGS}" \
|
||||
-DCMAKE_SYSTEM_NAME=unknown \
|
||||
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
|
||||
|
||||
cmake --build ${COMPILER_RT_BUILD_DIR}
|
||||
cmake --install ${COMPILER_RT_BUILD_DIR}
|
||||
}
|
||||
|
||||
build_compiler_rt 32
|
||||
build_compiler_rt 64
|
||||
|
||||
echo ""
|
||||
echo "success"
|
||||
echo "add this directory to your PATH: ${INSTALL_DIR}/bin/"
|
||||
@@ -0,0 +1 @@
|
||||
large-error-threshold = 192
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Default directory for cloning the llvm-project repository
|
||||
DEFAULT_DIR="llvm-project"
|
||||
|
||||
# Check if a directory argument is provided
|
||||
if [ $# -eq 1 ]; then
|
||||
DIR=$1
|
||||
else
|
||||
DIR=$DEFAULT_DIR
|
||||
fi
|
||||
|
||||
# Clone LLVM 18 (any revision after commit bd32aaa is supposed to work)
|
||||
if [ ! -d "${DIR}" ]; then
|
||||
git clone --depth 1 --branch release/18.x https://github.com/llvm/llvm-project.git "${DIR}"
|
||||
fi
|
||||
@@ -15,58 +15,58 @@
|
||||
|
||||
### Baseline
|
||||
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:--------|:------------------------|:-------------------------------- |
|
||||
| **`0`** | `3.36 us` (✅ **1.00x**) | `11.84 us` (❌ *3.52x slower*) |
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:--------|:-------------------------|:-------------------------------- |
|
||||
| **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**) |
|
||||
|
||||
### OddPorduct
|
||||
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:-------------|:-------------------------|:-------------------------------- |
|
||||
| **`10000`** | `3.11 ms` (✅ **1.00x**) | `1.53 ms` (🚀 **2.03x faster**) |
|
||||
| **`100000`** | `30.70 ms` (✅ **1.00x**) | `15.54 ms` (🚀 **1.98x faster**) |
|
||||
| **`300000`** | `92.68 ms` (✅ **1.00x**) | `45.47 ms` (🚀 **2.04x faster**) |
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:-------------|:--------------------------|:-------------------------------- |
|
||||
| **`10000`** | `3.60 ms` (✅ **1.00x**) | `1.57 ms` (🚀 **2.28x faster**) |
|
||||
| **`100000`** | `34.72 ms` (✅ **1.00x**) | `14.82 ms` (🚀 **2.34x faster**) |
|
||||
| **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**) |
|
||||
|
||||
### TriangleNumber
|
||||
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:-------------|:-------------------------|:-------------------------------- |
|
||||
| **`10000`** | `2.29 ms` (✅ **1.00x**) | `1.09 ms` (🚀 **2.11x faster**) |
|
||||
| **`100000`** | `22.84 ms` (✅ **1.00x**) | `10.66 ms` (🚀 **2.14x faster**) |
|
||||
| **`360000`** | `82.29 ms` (✅ **1.00x**) | `37.01 ms` (🚀 **2.22x faster**) |
|
||||
| **`10000`** | `2.43 ms` (✅ **1.00x**) | `1.12 ms` (🚀 **2.17x faster**) |
|
||||
| **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**) |
|
||||
| **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**) |
|
||||
|
||||
### FibonacciRecursive
|
||||
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:---------|:--------------------------|:--------------------------------- |
|
||||
| **`12`** | `135.67 us` (✅ **1.00x**) | `125.02 us` (✅ **1.09x faster**) |
|
||||
| **`16`** | `903.75 us` (✅ **1.00x**) | `762.79 us` (✅ **1.18x faster**) |
|
||||
| **`20`** | `6.12 ms` (✅ **1.00x**) | `4.96 ms` (✅ **1.23x faster**) |
|
||||
| **`24`** | `42.05 ms` (✅ **1.00x**) | `33.86 ms` (✅ **1.24x faster**) |
|
||||
| **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**) |
|
||||
| **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**) |
|
||||
| **`20`** | `6.54 ms` (✅ **1.00x**) | `6.20 ms` (✅ **1.05x faster**) |
|
||||
| **`24`** | `45.73 ms` (✅ **1.00x**) | `41.98 ms` (✅ **1.09x faster**) |
|
||||
|
||||
### FibonacciIterative
|
||||
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:----------|:-------------------------|:-------------------------------- |
|
||||
| **`64`** | `15.04 us` (✅ **1.00x**) | `29.45 us` (❌ *1.96x slower*) |
|
||||
| **`128`** | `26.36 us` (✅ **1.00x**) | `42.19 us` (❌ *1.60x slower*) |
|
||||
| **`256`** | `48.61 us` (✅ **1.00x**) | `65.71 us` (❌ *1.35x slower*) |
|
||||
| **`64`** | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*) |
|
||||
| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ *1.20x slower*) |
|
||||
| **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**) |
|
||||
|
||||
### FibonacciBinet
|
||||
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:----------|:-------------------------|:-------------------------------- |
|
||||
| **`64`** | `15.22 us` (✅ **1.00x**) | `41.46 us` (❌ *2.72x slower*) |
|
||||
| **`128`** | `17.05 us` (✅ **1.00x**) | `42.84 us` (❌ *2.51x slower*) |
|
||||
| **`256`** | `19.00 us` (✅ **1.00x**) | `44.36 us` (❌ *2.34x slower*) |
|
||||
| **`64`** | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*) |
|
||||
| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ *1.95x slower*) |
|
||||
| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ *1.85x slower*) |
|
||||
|
||||
### SHA1
|
||||
|
||||
| | `EVM` | `PVMInterpreter` |
|
||||
|:----------|:--------------------------|:--------------------------------- |
|
||||
| **`1`** | `110.04 us` (✅ **1.00x**) | `216.11 us` (❌ *1.96x slower*) |
|
||||
| **`64`** | `209.04 us` (✅ **1.00x**) | `309.48 us` (❌ *1.48x slower*) |
|
||||
| **`512`** | `903.65 us` (✅ **1.00x**) | `980.49 us` (✅ **1.09x slower**) |
|
||||
| **`1`** | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*) |
|
||||
| **`64`** | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ *1.38x slower*) |
|
||||
| **`512`** | `1.10 ms` (✅ **1.00x**) | `1.09 ms` (✅ **1.01x faster**) |
|
||||
|
||||
---
|
||||
Made with [criterion-table](https://github.com/nu11ptr/criterion-table)
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
# Generated by Cargo
|
||||
# will have compiled files and executables
|
||||
/target/
|
||||
|
||||
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
|
||||
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
|
||||
Cargo.lock
|
||||
|
||||
# These are backup files generated by rustfmt
|
||||
**/*.rs.bk
|
||||
|
||||
# IDE
|
||||
/.idea/
|
||||
/.vscode/
|
||||
@@ -0,0 +1,15 @@
|
||||
[package]
|
||||
name = "revive-build-utils"
|
||||
version = "0.2.0"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
authors = [
|
||||
"Cyrill Leutwiler <cyrill@parity.io>",
|
||||
]
|
||||
description = "Shared build utilities of the revive compiler"
|
||||
|
||||
[lib]
|
||||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
@@ -0,0 +1,10 @@
|
||||
# revive: Compiler Common
|
||||
|
||||
## License
|
||||
|
||||
This library is distributed under the terms of either
|
||||
|
||||
- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
|
||||
- MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
|
||||
|
||||
at your option.
|
||||
@@ -0,0 +1,50 @@
|
||||
//! The compiler build utilities library.
|
||||
|
||||
/// The revive LLVM host dependency directory prefix environment variable.
|
||||
pub const REVIVE_LLVM_HOST_PREFIX: &str = "LLVM_SYS_181_PREFIX";
|
||||
|
||||
/// The revive LLVM target dependency directory prefix environment variable.
|
||||
pub const REVIVE_LLVM_TARGET_PREFIX: &str = "REVIVE_LLVM_TARGET_PREFIX";
|
||||
|
||||
/// The revive LLVM host tool help link.
|
||||
pub const REVIVE_LLVM_BUILDER_HELP_LINK: &str =
|
||||
"https://github.com/paritytech/revive?tab=readme-ov-file#building-from-source";
|
||||
|
||||
/// Constructs a path to the LLVM tool `name`.
|
||||
///
|
||||
/// Respects the [`REVIVE_LLVM_HOST_PREFIX`] environment variable.
|
||||
pub fn llvm_host_tool(name: &str) -> std::path::PathBuf {
|
||||
std::env::var_os(REVIVE_LLVM_HOST_PREFIX)
|
||||
.map(Into::<std::path::PathBuf>::into)
|
||||
.unwrap_or_else(|| {
|
||||
panic!("install LLVM using the revive-llvm builder and export '{REVIVE_LLVM_HOST_PREFIX}'; see also: {REVIVE_LLVM_BUILDER_HELP_LINK}")
|
||||
})
|
||||
.join("bin")
|
||||
.join(name)
|
||||
}
|
||||
|
||||
/// Returns the LLVM lib dir.
|
||||
///
|
||||
/// Respects the [`REVIVE_LLVM_HOST_PREFIX`] environment variable.
|
||||
pub fn llvm_lib_dir() -> std::path::PathBuf {
|
||||
std::path::PathBuf::from(llvm_config("--libdir").trim())
|
||||
}
|
||||
|
||||
/// Returns the LLVM CXX compiler flags.
|
||||
///
|
||||
/// Respects the [`REVIVE_LLVM_HOST_PREFIX`] environment variable.
|
||||
pub fn llvm_cxx_flags() -> String {
|
||||
llvm_config("--cxxflags")
|
||||
}
|
||||
|
||||
/// Execute the `llvm-config` utility respecting the [`REVIVE_LLVM_HOST_PREFIX`] environment variable.
|
||||
fn llvm_config(arg: &str) -> String {
|
||||
let llvm_config = llvm_host_tool("llvm-config");
|
||||
let output = std::process::Command::new(&llvm_config)
|
||||
.arg(arg)
|
||||
.output()
|
||||
.unwrap_or_else(|error| panic!("`{} {arg}` failed: {error}", llvm_config.display()));
|
||||
|
||||
String::from_utf8(output.stdout)
|
||||
.unwrap_or_else(|_| panic!("output of `{} {arg}` should be utf8", llvm_config.display()))
|
||||
}
|
||||
@@ -8,4 +8,5 @@ authors.workspace = true
|
||||
build = "build.rs"
|
||||
description = "compiler builtins for the revive compiler"
|
||||
|
||||
[dependencies]
|
||||
[build-dependencies]
|
||||
revive-build-utils = { workspace = true }
|
||||
|
||||
+18
-11
@@ -3,25 +3,32 @@ use std::{env, fs, io::Read, path::Path, process::Command};
|
||||
pub const BUILTINS_ARCHIVE_FILE: &str = "libclang_rt.builtins-riscv64.a";
|
||||
|
||||
fn main() {
|
||||
let mut llvm_lib_dir = String::new();
|
||||
println!(
|
||||
"cargo:rerun-if-env-changed={}",
|
||||
revive_build_utils::REVIVE_LLVM_HOST_PREFIX
|
||||
);
|
||||
|
||||
Command::new("llvm-config")
|
||||
.args(["--libdir"])
|
||||
let llvm_config = revive_build_utils::llvm_host_tool("llvm-config");
|
||||
let mut llvm_lib_dir = String::new();
|
||||
Command::new(&llvm_config)
|
||||
.arg("--libdir")
|
||||
.output()
|
||||
.expect("llvm-config should be able to provide LD path")
|
||||
.unwrap_or_else(|_| {
|
||||
panic!(
|
||||
"{} should be able to provide LD path",
|
||||
llvm_config.display()
|
||||
)
|
||||
})
|
||||
.stdout
|
||||
.as_slice()
|
||||
.read_to_string(&mut llvm_lib_dir)
|
||||
.expect("llvm-config output should be utf8");
|
||||
|
||||
let mut lib_path = std::path::PathBuf::from(llvm_lib_dir.trim())
|
||||
.join("linux")
|
||||
let lib_path = revive_build_utils::llvm_lib_dir()
|
||||
.join("unknown")
|
||||
.join(BUILTINS_ARCHIVE_FILE);
|
||||
if !lib_path.exists() {
|
||||
lib_path = std::path::PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap())
|
||||
.join(BUILTINS_ARCHIVE_FILE);
|
||||
}
|
||||
let archive = fs::read(lib_path).expect("clang builtins not found");
|
||||
let archive = fs::read(&lib_path).expect("clang builtins not found");
|
||||
println!("cargo:rerun-if-env-changed={}", lib_path.display());
|
||||
|
||||
let out_dir = env::var_os("OUT_DIR").expect("has OUT_DIR");
|
||||
let archive_path = Path::new(&out_dir).join(BUILTINS_ARCHIVE_FILE);
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revive-common"
|
||||
version.workspace = true
|
||||
version = "0.2.1"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
@@ -15,6 +15,8 @@ doctest = false
|
||||
|
||||
[dependencies]
|
||||
anyhow = { workspace = true }
|
||||
hex = { workspace = true }
|
||||
sha3 = { workspace = true }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
serde_json = { workspace = true, features = [ "arbitrary_precision", "unbounded_depth" ] }
|
||||
serde_stacker = { workspace = true }
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
//! The contract identifier helper library.
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// This structure simplifies passing the contract identifiers through the compilation pipeline.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ContractIdentifier {
|
||||
/// The absolute file path.
|
||||
pub path: String,
|
||||
/// The contract name.
|
||||
/// Is set for Solidity contracts only. Otherwise it would be equal to the file name.
|
||||
pub name: Option<String>,
|
||||
/// The full contract identifier.
|
||||
/// For Solidity, The format is `<absolute file path>:<contract name>`.
|
||||
/// For other languages, `<absolute file path>`.
|
||||
pub full_path: String,
|
||||
}
|
||||
|
||||
impl ContractIdentifier {
|
||||
/// A shortcut constructor.
|
||||
pub fn new(path: String, name: Option<String>) -> Self {
|
||||
let full_path = match name {
|
||||
Some(ref name) => format!("{path}:{name}"),
|
||||
None => path.clone(),
|
||||
};
|
||||
|
||||
Self {
|
||||
path,
|
||||
name,
|
||||
full_path,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,12 +12,6 @@ pub static EXTENSION_ABI: &str = "abi";
|
||||
/// The Yul IR file extension.
|
||||
pub static EXTENSION_YUL: &str = "yul";
|
||||
|
||||
/// The EVM legacy assembly IR file extension.
|
||||
pub static EXTENSION_EVMLA: &str = "evmla";
|
||||
|
||||
/// The Ethereal IR file extension.
|
||||
pub static EXTENSION_ETHIR: &str = "ethir";
|
||||
|
||||
/// The EVM file extension.
|
||||
pub static EXTENSION_EVM: &str = "evm";
|
||||
|
||||
@@ -43,4 +37,4 @@ pub static EXTENSION_POLKAVM_ASSEMBLY: &str = "pvmasm";
|
||||
pub static EXTENSION_POLKAVM_BINARY: &str = "pvm";
|
||||
|
||||
/// The ELF shared object file extension.
|
||||
pub static EXTENSION_SHARED_OBJECT: &str = "so";
|
||||
pub static EXTENSION_OBJECT: &str = "o";
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
//! Keccak-256 hash utilities.
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sha3::digest::FixedOutput;
|
||||
use sha3::Digest;
|
||||
|
||||
pub const DIGEST_BYTES: usize = 32;
|
||||
|
||||
/// Keccak-256 hash utilities.
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct Keccak256 {
|
||||
/// Binary representation.
|
||||
bytes: [u8; DIGEST_BYTES],
|
||||
/// Hexadecimal string representation.
|
||||
string: String,
|
||||
}
|
||||
|
||||
impl Keccak256 {
|
||||
/// Computes the `keccak256` hash for `preimage`.
|
||||
pub fn from_slice(preimage: &[u8]) -> Self {
|
||||
let bytes = sha3::Keccak256::digest(preimage).into();
|
||||
let string = format!("0x{}", hex::encode(bytes));
|
||||
Self { bytes, string }
|
||||
}
|
||||
|
||||
/// Computes the `keccak256` hash for an array of `preimages`.
|
||||
pub fn from_slices<R: AsRef<[u8]>>(preimages: &[R]) -> Self {
|
||||
let mut hasher = sha3::Keccak256::new();
|
||||
for preimage in preimages.iter() {
|
||||
hasher.update(preimage);
|
||||
}
|
||||
let bytes: [u8; DIGEST_BYTES] = hasher.finalize_fixed().into();
|
||||
let string = format!("0x{}", hex::encode(bytes));
|
||||
Self { bytes, string }
|
||||
}
|
||||
|
||||
/// Returns a reference to the 32-byte SHA-3 hash.
|
||||
pub fn as_bytes(&self) -> &[u8] {
|
||||
self.bytes.as_slice()
|
||||
}
|
||||
|
||||
/// Returns a reference to the hexadecimal string representation.
|
||||
pub fn as_str(&self) -> &str {
|
||||
self.string.as_str()
|
||||
}
|
||||
|
||||
/// Extracts the binary representation.
|
||||
pub fn to_vec(&self) -> Vec<u8> {
|
||||
self.bytes.to_vec()
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for Keccak256 {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
write!(f, "{}", self.as_str())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
fn hash_and_stringify_works() {
|
||||
assert_eq!(
|
||||
super::Keccak256::from_slices(&["foo".as_bytes(), "bar".as_bytes(),]).as_str(),
|
||||
"0x38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -3,9 +3,13 @@
|
||||
pub(crate) mod base;
|
||||
pub(crate) mod bit_length;
|
||||
pub(crate) mod byte_length;
|
||||
pub(crate) mod contract_identifier;
|
||||
pub(crate) mod evm_version;
|
||||
pub(crate) mod exit_code;
|
||||
pub(crate) mod extension;
|
||||
pub(crate) mod keccak256;
|
||||
pub(crate) mod metadata;
|
||||
pub(crate) mod object;
|
||||
pub(crate) mod utils;
|
||||
|
||||
pub use self::base::*;
|
||||
@@ -14,4 +18,8 @@ pub use self::byte_length::*;
|
||||
pub use self::evm_version::EVMVersion;
|
||||
pub use self::exit_code::*;
|
||||
pub use self::extension::*;
|
||||
pub use self::keccak256::*;
|
||||
pub use self::metadata::*;
|
||||
pub use self::object::*;
|
||||
pub use self::utils::*;
|
||||
pub use contract_identifier::*;
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
//! The metadata hash type.
|
||||
|
||||
use std::str::FromStr;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// The metadata hash type.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
pub enum MetadataHash {
|
||||
/// Do not include bytecode hash.
|
||||
#[serde(rename = "none")]
|
||||
None,
|
||||
/// Include the `ipfs` hash.
|
||||
#[serde(rename = "ipfs")]
|
||||
IPFS,
|
||||
/// Include the `keccak256`` hash.
|
||||
#[serde(rename = "keccak256")]
|
||||
Keccak256,
|
||||
}
|
||||
|
||||
impl FromStr for MetadataHash {
|
||||
type Err = anyhow::Error;
|
||||
|
||||
fn from_str(string: &str) -> Result<Self, Self::Err> {
|
||||
match string {
|
||||
"none" => Ok(Self::None),
|
||||
"ipfs" => Ok(Self::IPFS),
|
||||
"keccak256" => Ok(Self::Keccak256),
|
||||
string => anyhow::bail!("unknown bytecode hash mode: `{string}`"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for MetadataHash {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::None => write!(f, "none"),
|
||||
Self::IPFS => write!(f, "ipfs"),
|
||||
Self::Keccak256 => write!(f, "keccak256"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
//! The revive binary object helper module.
|
||||
|
||||
use std::str::FromStr;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// The binary object format.
|
||||
///
|
||||
/// Unlinked contracts are stored in a different object format
|
||||
/// than final (linked) contract blobs.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
pub enum ObjectFormat {
|
||||
/// The unlinked ELF object format.
|
||||
ELF,
|
||||
/// The fully linked PVM format.
|
||||
PVM,
|
||||
}
|
||||
|
||||
impl ObjectFormat {
|
||||
pub const PVM_MAGIC: [u8; 4] = [b'P', b'V', b'M', b'\0'];
|
||||
pub const ELF_MAGIC: [u8; 4] = [0x7f, b'E', b'L', b'F'];
|
||||
}
|
||||
|
||||
impl FromStr for ObjectFormat {
|
||||
type Err = anyhow::Error;
|
||||
|
||||
fn from_str(value: &str) -> Result<Self, Self::Err> {
|
||||
match value {
|
||||
"ELF" => Ok(Self::ELF),
|
||||
"PVM" => Ok(Self::PVM),
|
||||
_ => anyhow::bail!(
|
||||
"Unknown object format: {value}. Supported formats: {}, {}",
|
||||
Self::ELF,
|
||||
Self::PVM,
|
||||
),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<&[u8]> for ObjectFormat {
|
||||
type Error = &'static str;
|
||||
|
||||
fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
|
||||
if value.starts_with(&Self::PVM_MAGIC) {
|
||||
return Ok(Self::PVM);
|
||||
}
|
||||
if value.starts_with(&Self::ELF_MAGIC) {
|
||||
return Ok(Self::ELF);
|
||||
}
|
||||
Err("expected a contract object")
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for ObjectFormat {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::ELF => write!(f, "ELF"),
|
||||
Self::PVM => write!(f, "PVM"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,25 +1,45 @@
|
||||
//! The compiler common utils.
|
||||
|
||||
/// Deserializes a `serde_json` object from slice with the recursion limit disabled.
|
||||
///
|
||||
/// Must be used for all JSON I/O to avoid crashes due to the aforementioned limit.
|
||||
pub fn deserialize_from_slice<O>(input: &[u8]) -> anyhow::Result<O>
|
||||
where
|
||||
O: serde::de::DeserializeOwned,
|
||||
{
|
||||
let mut deserializer = serde_json::Deserializer::from_slice(input);
|
||||
deserializer.disable_recursion_limit();
|
||||
let deserializer = serde_stacker::Deserializer::new(&mut deserializer);
|
||||
let result = O::deserialize(deserializer)?;
|
||||
Ok(result)
|
||||
let deserializer = serde_json::Deserializer::from_slice(input);
|
||||
deserialize(deserializer)
|
||||
}
|
||||
|
||||
/// Deserializes a `serde_json` object from string with the recursion limit disabled.
|
||||
///
|
||||
/// Must be used for all JSON I/O to avoid crashes due to the aforementioned limit.
|
||||
pub fn deserialize_from_str<O>(input: &str) -> anyhow::Result<O>
|
||||
where
|
||||
O: serde::de::DeserializeOwned,
|
||||
{
|
||||
let mut deserializer = serde_json::Deserializer::from_str(input);
|
||||
let deserializer = serde_json::Deserializer::from_str(input);
|
||||
deserialize(deserializer)
|
||||
}
|
||||
|
||||
/// Deserializes a `serde_json` object from reader with the recursion limit disabled.
|
||||
///
|
||||
/// Must be used for all JSON I/O to avoid crashes due to the aforementioned limit.
|
||||
pub fn deserialize_from_reader<R, O>(reader: R) -> anyhow::Result<O>
|
||||
where
|
||||
R: std::io::Read,
|
||||
O: serde::de::DeserializeOwned,
|
||||
{
|
||||
let deserializer = serde_json::Deserializer::from_reader(reader);
|
||||
deserialize(deserializer)
|
||||
}
|
||||
|
||||
/// Runs the generic deserializer.
|
||||
pub fn deserialize<'de, R, O>(mut deserializer: serde_json::Deserializer<R>) -> anyhow::Result<O>
|
||||
where
|
||||
R: serde_json::de::Read<'de>,
|
||||
O: serde::de::DeserializeOwned,
|
||||
{
|
||||
deserializer.disable_recursion_limit();
|
||||
let deserializer = serde_stacker::Deserializer::new(&mut deserializer);
|
||||
let result = O::deserialize(deserializer)?;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
[package]
|
||||
name = "revive-differential"
|
||||
version.workspace = true
|
||||
description = "utilities for differential testing the revive compiler against EVM"
|
||||
version = "0.2.0"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
authors.workspace = true
|
||||
@@ -13,4 +14,4 @@ serde = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
alloy-primitives = { workspace = true, features = ["serde"] }
|
||||
alloy-genesis = { workspace = true }
|
||||
alloy-serde = { workspace = true }
|
||||
alloy-serde = { workspace = true }
|
||||
|
||||
@@ -16,9 +16,16 @@
|
||||
"shanghaiTime": 0,
|
||||
"cancunTime": 0,
|
||||
"terminalTotalDifficulty": 0,
|
||||
"terminalTotalDifficultyPassed": true
|
||||
"terminalTotalDifficultyPassed": true,
|
||||
"blobSchedule": {
|
||||
"cancun": {
|
||||
"target": 3,
|
||||
"max": 6,
|
||||
"baseFeeUpdateFraction": 3338477
|
||||
}
|
||||
}
|
||||
},
|
||||
"coinbase": "0x0000000000000000000000000000000000000000",
|
||||
"coinbase": "0xffffffffffffffffffffffffffffffffffffffff",
|
||||
"difficulty": "0x20000",
|
||||
"extraData": "",
|
||||
"gasLimit": "0xffffffff",
|
||||
|
||||
@@ -3,8 +3,8 @@ use std::time::Duration;
|
||||
/// Parse a go formatted duration.
|
||||
///
|
||||
/// Sources:
|
||||
/// - https://crates.io/crates/go-parse-duration (fixed an utf8 bug)
|
||||
/// - https://github.com/golang/go/blob/master/src/time/format.go
|
||||
/// - <https://crates.io/crates/go-parse-duration> (fixed an utf8 bug)
|
||||
/// - <https://github.com/golang/go/blob/master/src/time/format.go>
|
||||
pub fn parse_go_duration(value: &str) -> Result<Duration, String> {
|
||||
parse_duration(value).map(|ns| Duration::from_nanos(ns.unsigned_abs()))
|
||||
}
|
||||
|
||||
@@ -413,7 +413,7 @@ impl Evm {
|
||||
let stderr = str::from_utf8(output.stderr.as_slice())
|
||||
.unwrap_or_else(|err| panic!("{EXECUTABLE_NAME} stderr failed to parse: {err}"));
|
||||
|
||||
let mut log: EvmLog = stdout.into();
|
||||
let mut log: EvmLog = format!("{stdout}{stderr}").as_str().into();
|
||||
log.stderr = stderr.into();
|
||||
if self.bench {
|
||||
log.parse_gas_used_from_bench();
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
[package]
|
||||
name = "revive-explorer"
|
||||
version = "0.1.0"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
authors.workspace = true
|
||||
description = "Helper utility to inspect debug builds"
|
||||
|
||||
[[bin]]
|
||||
name = "revive-explorer"
|
||||
path = "src/main.rs"
|
||||
|
||||
[dependencies]
|
||||
anyhow = { workspace = true }
|
||||
clap = { workspace = true, features = ["help", "std", "derive"] }
|
||||
num_cpus = { workspace = true }
|
||||
|
||||
revive-yul = { workspace = true }
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
# revive-explorer
|
||||
|
||||
The `revive-explorer` is a helper utility for exploring the compilers YUL lowering unit.
|
||||
|
||||
It analyzes a given shared objects from the debug dump and outputs:
|
||||
- The count of each YUL statement translated.
|
||||
- A per YUL statement break-down of bytecode size contributed per.
|
||||
- Estimated `yul-phaser` cost parameters.
|
||||
|
||||
Example:
|
||||
|
||||
```
|
||||
statements count:
|
||||
block 532
|
||||
Caller 20
|
||||
Not 73
|
||||
Gas 24
|
||||
Shr 2
|
||||
...
|
||||
Shl 259
|
||||
SetImmutable 2
|
||||
CodeSize 1
|
||||
CallDataLoad 87
|
||||
Return 56
|
||||
bytes per statement:
|
||||
Or 756
|
||||
CodeCopy 158
|
||||
Log3 620
|
||||
Return 1562
|
||||
MStore 36128
|
||||
...
|
||||
ReturnDataCopy 2854
|
||||
DataOffset 28
|
||||
assignment 1194
|
||||
Number 540
|
||||
CallValue 4258
|
||||
yul-phaser parameters:
|
||||
--break-cost 1
|
||||
--variable-declaration-cost 3
|
||||
--function-call-cost 8
|
||||
--if-cost 4
|
||||
--expression-statement-cost 6
|
||||
--function-definition-cost 11
|
||||
--switch-cost 3
|
||||
--block-cost 1
|
||||
--leave-cost 1
|
||||
--assignment-cost 1
|
||||
```
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
//! The `llvm-dwarfdump` utility helper library.
|
||||
|
||||
use std::{
|
||||
path::{Path, PathBuf},
|
||||
process::{Command, Stdio},
|
||||
};
|
||||
|
||||
pub static EXECUTABLE: &str = "llvm-dwarfdump";
|
||||
pub static DEBUG_LINES_ARGUMENTS: [&str; 1] = ["--debug-line"];
|
||||
pub static SOURCE_FILE_ARGUMENTS: [&str; 1] = ["--show-sources"];
|
||||
|
||||
/// Calls the `llvm-dwarfdump` tool to extract debug line information
|
||||
/// from the shared object at `path`. Returns the output.
|
||||
///
|
||||
/// Provide `Some(dwarfdump_exectuable)` to override the default executable.
|
||||
pub fn debug_lines(
|
||||
shared_object: &Path,
|
||||
dwarfdump_executable: &Option<PathBuf>,
|
||||
) -> anyhow::Result<String> {
|
||||
dwarfdump(shared_object, dwarfdump_executable, &DEBUG_LINES_ARGUMENTS)
|
||||
}
|
||||
|
||||
/// Calls the `llvm-dwarfdump` tool to extract the source file name.
|
||||
/// Returns the source file path.
|
||||
///
|
||||
/// Provide `Some(dwarfdump_exectuable)` to override the default executable.
|
||||
pub fn source_file(
|
||||
shared_object: &Path,
|
||||
dwarfdump_executable: &Option<PathBuf>,
|
||||
) -> anyhow::Result<PathBuf> {
|
||||
let output = dwarfdump(shared_object, dwarfdump_executable, &SOURCE_FILE_ARGUMENTS)?;
|
||||
let output = output.trim();
|
||||
|
||||
if output.is_empty() {
|
||||
anyhow::bail!(
|
||||
"the shared object at path `{}` doesn't contain the source file name. Hint: compile with debug information (-g)?",
|
||||
shared_object.display()
|
||||
);
|
||||
}
|
||||
|
||||
Ok(output.into())
|
||||
}
|
||||
|
||||
/// The internal `llvm-dwarfdump` helper function.
|
||||
fn dwarfdump(
|
||||
shared_object: &Path,
|
||||
dwarfdump_executable: &Option<PathBuf>,
|
||||
arguments: &[&str],
|
||||
) -> anyhow::Result<String> {
|
||||
let executable = dwarfdump_executable
|
||||
.to_owned()
|
||||
.unwrap_or_else(|| PathBuf::from(EXECUTABLE));
|
||||
|
||||
let output = Command::new(executable)
|
||||
.args(arguments)
|
||||
.arg(shared_object)
|
||||
.stdin(Stdio::null())
|
||||
.stdout(Stdio::piped())
|
||||
.stderr(Stdio::piped())
|
||||
.spawn()?
|
||||
.wait_with_output()?;
|
||||
|
||||
if !output.status.success() {
|
||||
anyhow::bail!(String::from_utf8_lossy(&output.stderr).to_string());
|
||||
}
|
||||
|
||||
Ok(String::from_utf8_lossy(&output.stdout).to_string())
|
||||
}
|
||||
@@ -0,0 +1,222 @@
|
||||
//! The core dwarf dump analyzer library.
|
||||
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
|
||||
use revive_yul::lexer::token::location::Location;
|
||||
|
||||
use crate::location_mapper::{self, LocationMapper};
|
||||
|
||||
/// The dwarf dump analyzer.
|
||||
///
|
||||
/// Loads debug information from `llvm-dwarfdump` and calculates statistics
|
||||
/// about the compiled YUL statements:
|
||||
/// - Statements count
|
||||
/// - Per-statement
|
||||
#[derive(Debug, Default)]
|
||||
pub struct DwarfdumpAnalyzer {
|
||||
/// The YUL source file path.
|
||||
source: PathBuf,
|
||||
|
||||
/// The YUL location to statements map.
|
||||
location_map: HashMap<Location, String>,
|
||||
|
||||
/// The `llvm-dwarfdump --debug-lines` output.
|
||||
debug_lines: String,
|
||||
|
||||
/// The observed statements.
|
||||
statements_count: HashMap<String, usize>,
|
||||
/// The observed statement to instructions size.
|
||||
statements_size: HashMap<String, u64>,
|
||||
}
|
||||
|
||||
impl DwarfdumpAnalyzer {
|
||||
/// The debug info analyzer constructor.
|
||||
///
|
||||
/// `source` is the path to the YUL source file.
|
||||
/// `debug_lines` is the `llvm-dwarfdump --debug-lines` output.
|
||||
pub fn new(source: &Path, debug_lines: String) -> Self {
|
||||
Self {
|
||||
source: source.to_path_buf(),
|
||||
debug_lines,
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
/// Run the analysis.
|
||||
pub fn analyze(&mut self) -> anyhow::Result<()> {
|
||||
self.map_locations()?;
|
||||
self.analyze_statements()?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Populate the maps so that we can always unwrap later.
|
||||
fn map_locations(&mut self) -> anyhow::Result<()> {
|
||||
self.location_map = LocationMapper::map_locations(&self.source)?;
|
||||
|
||||
self.statements_count = HashMap::with_capacity(self.location_map.len());
|
||||
self.statements_size = HashMap::with_capacity(self.location_map.len());
|
||||
|
||||
for statement in self.location_map.values() {
|
||||
if !self.statements_size.contains_key(statement) {
|
||||
self.statements_size.insert(statement.clone(), 0);
|
||||
}
|
||||
|
||||
*self.statements_count.entry(statement.clone()).or_insert(0) += 1;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Analyze how much bytes of insturctions each statement contributes.
|
||||
fn analyze_statements(&mut self) -> anyhow::Result<()> {
|
||||
let mut previous_offset = 0;
|
||||
let mut previous_location = Location::new(0, 0);
|
||||
|
||||
for line in self
|
||||
.debug_lines
|
||||
.lines()
|
||||
.skip_while(|line| !line.starts_with("Address"))
|
||||
.skip(2)
|
||||
{
|
||||
let mut parts = line.split_whitespace();
|
||||
let (Some(offset), Some(line), Some(column)) =
|
||||
(parts.next(), parts.next(), parts.next())
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
|
||||
let current_offset = u64::from_str_radix(offset.trim_start_matches("0x"), 16)?;
|
||||
let mut current_location = Location::new(line.parse()?, column.parse()?);
|
||||
|
||||
// TODO: A bug? Needs further investigation.
|
||||
if current_location.line == 0 && current_location.column != 0 {
|
||||
current_location.line = previous_location.line;
|
||||
}
|
||||
|
||||
if let Some(statement) = self.location_map.get(&previous_location) {
|
||||
let contribution = current_offset - previous_offset;
|
||||
*self.statements_size.get_mut(statement).unwrap() += contribution;
|
||||
}
|
||||
|
||||
previous_offset = current_offset;
|
||||
previous_location = current_location;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Print the per-statement count break-down.
|
||||
pub fn display_statement_count(&self) {
|
||||
println!("statements count:");
|
||||
for (statement, count) in self.statements_count.iter() {
|
||||
println!("\t{statement} {count}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Print the per-statement byte size contribution break-down.
|
||||
pub fn display_statement_size(&self) {
|
||||
println!("bytes per statement:");
|
||||
for (statement, size) in self.statements_size.iter() {
|
||||
println!("\t{statement} {size}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Print the estimated `yul-phaser` cost parameters.
|
||||
pub fn display_phaser_costs(&self, yul_phaser_scale: u64) {
|
||||
println!("yul-phaser parameters:");
|
||||
for (parameter, cost) in self.phaser_costs(yul_phaser_scale) {
|
||||
println!("\t{parameter} {cost}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Estimate the `yul-phaser` costs using the simplified weight function:
|
||||
/// `Total size / toal count = cost`
|
||||
pub fn phaser_costs(&self, yul_phaser_scale: u64) -> Vec<(String, u64)> {
|
||||
let mut costs: HashMap<String, (usize, u64)> = HashMap::with_capacity(16);
|
||||
for (statement, count) in self
|
||||
.statements_count
|
||||
.iter()
|
||||
.filter(|(_, count)| **count > 0)
|
||||
{
|
||||
let size = self.statements_size.get(statement).unwrap();
|
||||
let cost = match statement.as_str() {
|
||||
location_mapper::FOR => "--for-loop-cost",
|
||||
location_mapper::OTHER => continue,
|
||||
location_mapper::INTERNAL => continue,
|
||||
location_mapper::BLOCK => "--block-cost",
|
||||
location_mapper::FUNCTION_CALL => "--function-call-cost",
|
||||
location_mapper::IF => "--if-cost",
|
||||
location_mapper::SWITCH => "--switch-cost",
|
||||
location_mapper::DECLARATION => "--variable-declaration-cost",
|
||||
location_mapper::ASSIGNMENT => "--assignment-cost",
|
||||
location_mapper::FUNCTION_DEFINITION => "--function-definition-cost",
|
||||
location_mapper::IDENTIFIER => "--identifier-cost",
|
||||
location_mapper::LITERAL => "--literal-cost",
|
||||
_ => "--expression-statement-cost",
|
||||
};
|
||||
|
||||
let entry = costs.entry(cost.to_string()).or_default();
|
||||
entry.0 += count;
|
||||
entry.1 += size;
|
||||
}
|
||||
|
||||
let costs = costs
|
||||
.iter()
|
||||
.map(|(cost, (count, size))| {
|
||||
let ratio = *size / *count as u64;
|
||||
(cost.to_string(), ratio.min(100))
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let scaled_costs = scale_to(
|
||||
costs
|
||||
.iter()
|
||||
.map(|(_, ratio)| *ratio)
|
||||
.collect::<Vec<_>>()
|
||||
.as_slice(),
|
||||
yul_phaser_scale,
|
||||
);
|
||||
|
||||
costs
|
||||
.iter()
|
||||
.zip(scaled_costs)
|
||||
.map(|((cost, _), scaled_ratio)| (cost.to_string(), scaled_ratio))
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
/// Given a slice of u64 values, returns a `Vec<u64>` where each element
|
||||
/// is linearly scaled into the closed interval [1, 10].
|
||||
fn scale_to(data: &[u64], scale_max: u64) -> Vec<u64> {
|
||||
if data.is_empty() {
|
||||
return Vec::new();
|
||||
}
|
||||
|
||||
let mut min = data[0];
|
||||
let mut max = data[0];
|
||||
for &x in &data[1..] {
|
||||
if x < min {
|
||||
min = x;
|
||||
}
|
||||
if x > max {
|
||||
max = x;
|
||||
}
|
||||
}
|
||||
if max < scale_max {
|
||||
return data.to_vec();
|
||||
}
|
||||
|
||||
let range = max - min;
|
||||
data.iter()
|
||||
.map(|&x| {
|
||||
if range == 0 {
|
||||
1
|
||||
} else {
|
||||
1 + (x - min) * scale_max / range
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
//! The revive explorer leverages debug info to get insights into emitted code.
|
||||
|
||||
pub mod dwarfdump;
|
||||
pub mod dwarfdump_analyzer;
|
||||
pub mod location_mapper;
|
||||
pub mod yul_phaser;
|
||||
@@ -0,0 +1,123 @@
|
||||
//! The location mapper utility maps YUL source locations to AST statements.
|
||||
|
||||
use std::{collections::HashMap, path::Path};
|
||||
|
||||
use revive_yul::{
|
||||
lexer::{token::location::Location, Lexer},
|
||||
parser::{
|
||||
identifier::Identifier,
|
||||
statement::{
|
||||
assignment::Assignment,
|
||||
block::Block,
|
||||
expression::{function_call::FunctionCall, literal::Literal},
|
||||
for_loop::ForLoop,
|
||||
function_definition::FunctionDefinition,
|
||||
if_conditional::IfConditional,
|
||||
object::Object,
|
||||
switch::Switch,
|
||||
variable_declaration::VariableDeclaration,
|
||||
},
|
||||
},
|
||||
visitor::{AstNode, AstVisitor},
|
||||
};
|
||||
|
||||
/// Code attributed to an unknown location.
|
||||
pub const OTHER: &str = "other";
|
||||
/// Code attributed to a compiler internal location.
|
||||
pub const INTERNAL: &str = "internal";
|
||||
/// Code attributed to a block.
|
||||
pub const BLOCK: &str = "block";
|
||||
/// Code attributed to a function call.
|
||||
pub const FUNCTION_CALL: &str = "function_call";
|
||||
/// Code attributed to a for loop.
|
||||
pub const FOR: &str = "for";
|
||||
/// Code attributed to an if statement.
|
||||
pub const IF: &str = "if";
|
||||
/// Code attributed to a switch statement.
|
||||
pub const SWITCH: &str = "switch";
|
||||
/// Code attributed to a variable declaration.
|
||||
pub const DECLARATION: &str = "let";
|
||||
/// Code attributed to a variable assignement.
|
||||
pub const ASSIGNMENT: &str = "assignment";
|
||||
/// Code attributed to a function definition.
|
||||
pub const FUNCTION_DEFINITION: &str = "function_definition";
|
||||
/// Code attributed to an identifier.
|
||||
pub const IDENTIFIER: &str = "identifier";
|
||||
/// Code attributed to a literal.
|
||||
pub const LITERAL: &str = "literal";
|
||||
|
||||
/// The location to statements mapper.
|
||||
pub struct LocationMapper(HashMap<Location, String>);
|
||||
|
||||
impl LocationMapper {
|
||||
/// Construct a node location map from the given YUL `source` file.
|
||||
pub fn map_locations(source: &Path) -> anyhow::Result<HashMap<Location, String>> {
|
||||
let mut lexer = Lexer::new(std::fs::read_to_string(source)?);
|
||||
let ast = Object::parse(&mut lexer, None).map_err(|error| {
|
||||
anyhow::anyhow!("Contract `{}` parsing error: {:?}", source.display(), error)
|
||||
})?;
|
||||
|
||||
let mut location_map = Self(Default::default());
|
||||
ast.accept(&mut location_map);
|
||||
location_map.0.insert(Location::new(0, 0), OTHER.into());
|
||||
location_map.0.insert(Location::new(1, 0), INTERNAL.into());
|
||||
|
||||
Ok(location_map.0)
|
||||
}
|
||||
}
|
||||
|
||||
impl AstVisitor for LocationMapper {
|
||||
fn visit(&mut self, node: &impl AstNode) {
|
||||
node.visit_children(self);
|
||||
}
|
||||
|
||||
fn visit_block(&mut self, node: &Block) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, BLOCK.into());
|
||||
}
|
||||
|
||||
fn visit_assignment(&mut self, node: &Assignment) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, ASSIGNMENT.into());
|
||||
}
|
||||
|
||||
fn visit_if_conditional(&mut self, node: &IfConditional) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, IF.into());
|
||||
}
|
||||
|
||||
fn visit_variable_declaration(&mut self, node: &VariableDeclaration) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, DECLARATION.into());
|
||||
}
|
||||
|
||||
fn visit_function_call(&mut self, node: &FunctionCall) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, node.name.to_string());
|
||||
}
|
||||
|
||||
fn visit_function_definition(&mut self, node: &FunctionDefinition) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, FUNCTION_DEFINITION.into());
|
||||
}
|
||||
|
||||
fn visit_identifier(&mut self, node: &Identifier) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, IDENTIFIER.into());
|
||||
}
|
||||
|
||||
fn visit_literal(&mut self, node: &Literal) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, LITERAL.into());
|
||||
}
|
||||
|
||||
fn visit_for_loop(&mut self, node: &ForLoop) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, FOR.into());
|
||||
}
|
||||
|
||||
fn visit_switch(&mut self, node: &Switch) {
|
||||
node.visit_children(self);
|
||||
self.0.insert(node.location, SWITCH.into());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
use std::path::PathBuf;
|
||||
|
||||
use clap::Parser;
|
||||
|
||||
use revive_explorer::{dwarfdump, dwarfdump_analyzer::DwarfdumpAnalyzer, yul_phaser};
|
||||
|
||||
/// The `revive-explorer` is a helper utility for exploring the compilers YUL lowering unit.
|
||||
///
|
||||
/// It analyzes a given shared objects from the debug dump and outputs:
|
||||
/// - The count of each YUL statement translated.
|
||||
/// - A per YUL statement break-down of bytecode size contributed per.
|
||||
/// - Estimated `yul-phaser` cost parameters.
|
||||
///
|
||||
/// Note: This tool might not be fully accurate, especially when the code was optimized.
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about, long_about = None)]
|
||||
struct Args {
|
||||
/// Path of the dwarfdump executable.
|
||||
#[arg(short, long)]
|
||||
dwarfdump: Option<PathBuf>,
|
||||
|
||||
/// The YUL phaser cost scale maximum value.
|
||||
#[arg(short, long, default_value_t = 10)]
|
||||
cost_scale: u64,
|
||||
|
||||
/// Run the provided yul-phaser executable using the estimated costs.
|
||||
#[arg(short, long)]
|
||||
yul_phaser: Option<PathBuf>,
|
||||
|
||||
/// Path of the shared object to analyze.
|
||||
/// It must have been compiled with debug info (-g).
|
||||
file: PathBuf,
|
||||
}
|
||||
|
||||
fn main() -> anyhow::Result<()> {
|
||||
let args = Args::parse();
|
||||
|
||||
let source_file = dwarfdump::source_file(&args.file, &args.dwarfdump)?;
|
||||
let debug_lines = dwarfdump::debug_lines(&args.file, &args.dwarfdump)?;
|
||||
let mut analyzer = DwarfdumpAnalyzer::new(source_file.as_path(), debug_lines);
|
||||
|
||||
analyzer.analyze()?;
|
||||
|
||||
if let Some(path) = args.yul_phaser.as_ref() {
|
||||
yul_phaser::run(
|
||||
path,
|
||||
source_file.as_path(),
|
||||
analyzer.phaser_costs(args.cost_scale).as_slice(),
|
||||
num_cpus::get() / 2, // TODO: should be configurable.
|
||||
)?;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
analyzer.display_statement_count();
|
||||
analyzer.display_statement_size();
|
||||
analyzer.display_phaser_costs(args.cost_scale);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
//! The revive explorer YUL phaser utility library.
|
||||
//!
|
||||
//! This can be used to invoke the `yul-phaser` utility,
|
||||
//! used to find better YUL optimizer sequences.
|
||||
|
||||
use std::{
|
||||
path::{Path, PathBuf},
|
||||
process::{Command, Stdio},
|
||||
thread,
|
||||
time::{SystemTime, UNIX_EPOCH},
|
||||
};
|
||||
|
||||
/// The `yul-phaser` sane default arguments:
|
||||
/// - Less verbose output.
|
||||
/// - Sufficient rounds.
|
||||
/// - Sufficient random population start.
|
||||
const ARGUMENTS: [&str; 6] = [
|
||||
"--hide-round",
|
||||
"--rounds",
|
||||
"1000",
|
||||
"--random-population",
|
||||
"100",
|
||||
"--show-only-top-chromosome",
|
||||
];
|
||||
|
||||
/// Run multiple YUL phaser executables in parallel.
|
||||
pub fn run(
|
||||
executable: &Path,
|
||||
source: &Path,
|
||||
costs: &[(String, u64)],
|
||||
n_threads: usize,
|
||||
) -> anyhow::Result<()> {
|
||||
let mut handles = Vec::with_capacity(n_threads);
|
||||
|
||||
for n in 0..n_threads {
|
||||
let executable = executable.to_path_buf();
|
||||
let source = source.to_path_buf();
|
||||
let costs = costs.to_vec();
|
||||
|
||||
handles.push(thread::spawn(move || {
|
||||
spawn_process(executable, source, costs, n)
|
||||
}));
|
||||
}
|
||||
|
||||
for handle in handles {
|
||||
let _ = handle.join();
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// The `yul-phaser` process spawning helper function.
|
||||
fn spawn_process(
|
||||
executable: PathBuf,
|
||||
source: PathBuf,
|
||||
costs: Vec<(String, u64)>,
|
||||
seed: usize,
|
||||
) -> anyhow::Result<()> {
|
||||
let cost_parameters = costs
|
||||
.iter()
|
||||
.flat_map(|(parameter, cost)| vec![parameter.clone(), cost.to_string()]);
|
||||
|
||||
let secs = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.expect("Time went backwards")
|
||||
.as_secs();
|
||||
|
||||
Command::new(executable)
|
||||
.args(cost_parameters)
|
||||
.args(ARGUMENTS)
|
||||
.arg("--seed")
|
||||
.arg((seed + secs as usize).to_string())
|
||||
.arg(source)
|
||||
.stdin(Stdio::null())
|
||||
.spawn()?
|
||||
.wait()?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revive-integration"
|
||||
version.workspace = true
|
||||
version = "0.2.0"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
@@ -8,19 +8,14 @@ authors.workspace = true
|
||||
description = "revive compiler integration test cases"
|
||||
|
||||
[dependencies]
|
||||
polkavm = { workspace = true }
|
||||
alloy-primitives = { workspace = true }
|
||||
alloy-sol-types = { workspace = true }
|
||||
hex = { workspace = true }
|
||||
env_logger = { workspace = true }
|
||||
log = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
|
||||
revive-solidity = { workspace = true }
|
||||
revive-differential = { workspace = true }
|
||||
revive-llvm-context = { workspace = true }
|
||||
revive-common = { workspace = true }
|
||||
resolc = { workspace = true }
|
||||
revive-runner = { workspace = true }
|
||||
revive-llvm-context = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
sha1 = { workspace = true }
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"Baseline": 1110,
|
||||
"Computation": 2389,
|
||||
"DivisionArithmetics": 14822,
|
||||
"ERC20": 23973,
|
||||
"Events": 1605,
|
||||
"FibonacciIterative": 2023,
|
||||
"Flipper": 1989,
|
||||
"SHA1": 17026
|
||||
"Baseline": 932,
|
||||
"Computation": 2313,
|
||||
"DivisionArithmetics": 9103,
|
||||
"ERC20": 17479,
|
||||
"Events": 1692,
|
||||
"FibonacciIterative": 1508,
|
||||
"Flipper": 2098,
|
||||
"SHA1": 8176
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
// SPDX-License-Identifier: GPL-3.0
|
||||
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Upload": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "AddModMulMod"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Instantiate": {
|
||||
"value": 123123,
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "AddModMulModTester"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"VerifyCall": {
|
||||
"success": true
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract AddModMulMod {
|
||||
function test() public returns (uint256) {
|
||||
// Note that this only works because computation on literals is done using
|
||||
// unbounded integers.
|
||||
if ((2**255 + 2**255) % 7 != addmod(2**255, 2**255, 7)) return 1;
|
||||
if ((2**255 + 2**255) % 7 != addmod(2**255, 2**255, 7)) return 2;
|
||||
return 0;
|
||||
}
|
||||
|
||||
function f(uint256 d) public pure returns (uint256) {
|
||||
addmod(1, 2, d);
|
||||
return 2;
|
||||
}
|
||||
|
||||
function g(uint256 d) public pure returns (uint256) {
|
||||
mulmod(1, 2, d);
|
||||
return 2;
|
||||
}
|
||||
|
||||
function h() public pure returns (uint256) {
|
||||
mulmod(0, 1, 2);
|
||||
mulmod(1, 0, 2);
|
||||
addmod(0, 1, 2);
|
||||
addmod(1, 0, 2);
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
contract AddModMulModTester {
|
||||
constructor() payable {
|
||||
AddModMulMod c = new AddModMulMod();
|
||||
|
||||
assert(c.test() == 0);
|
||||
|
||||
try c.f(0) returns (uint m) { revert(); } catch Panic(uint errorCode) {
|
||||
assert(errorCode == 0x12);
|
||||
}
|
||||
|
||||
try c.g(0) returns (uint m) { revert(); } catch Panic(uint errorCode) {
|
||||
assert(errorCode == 0x12);
|
||||
}
|
||||
|
||||
assert(c.h() == 2);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity ^0.8.28;
|
||||
|
||||
contract Predicted {
|
||||
uint public salt;
|
||||
|
||||
constructor(uint _salt) {
|
||||
salt = _salt;
|
||||
}
|
||||
}
|
||||
|
||||
contract AddressPredictor {
|
||||
constructor(uint _salt, bytes memory _bytecode) payable {
|
||||
address deployed = address(new Predicted{salt: bytes32(_salt)}(_salt));
|
||||
address predicted = predictAddress(_salt, _bytecode);
|
||||
assert(deployed == predicted);
|
||||
}
|
||||
|
||||
function predictAddress(
|
||||
uint _foo,
|
||||
bytes memory _bytecode
|
||||
) public view returns (address predicted) {
|
||||
bytes32 addr = keccak256(
|
||||
abi.encodePacked(
|
||||
bytes1(0xff),
|
||||
address(this),
|
||||
bytes32(_foo),
|
||||
keccak256(abi.encodePacked(_bytecode, abi.encode(_foo)))
|
||||
)
|
||||
);
|
||||
predicted = address(uint160(uint(addr)));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Upload": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "BalanceReceiver"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "Balance"
|
||||
}
|
||||
},
|
||||
"value": 24
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "1c8d16b30000000000000000000000000303030303030303030303030303030303030303000000000000000000000000000000000000000000000000000000000000000a"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "6ada15d90000000000000000000000000303030303030303030303030303030303030303000000000000000000000000000000000000000000000000000000000000000a"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract BalanceReceiver {
|
||||
constructor() payable {}
|
||||
|
||||
fallback() external payable {}
|
||||
}
|
||||
|
||||
contract Balance {
|
||||
constructor() payable {
|
||||
// 0 to EOA
|
||||
transfer_to(payable(address(0xdeadbeef)), 0);
|
||||
send_to(payable(address(0xdeadbeef)), 0);
|
||||
|
||||
// 1 to EOA
|
||||
transfer_to(payable(address(0xcafebabe)), 1);
|
||||
send_to(payable(address(0xcafebabe)), 1);
|
||||
|
||||
BalanceReceiver balanceReceiver = new BalanceReceiver();
|
||||
|
||||
// 0 to contract
|
||||
transfer_to(payable(address(balanceReceiver)), 0);
|
||||
send_to(payable(address(balanceReceiver)), 0);
|
||||
|
||||
// 1 to contract
|
||||
transfer_to(payable(address(balanceReceiver)), 1);
|
||||
send_to(payable(address(balanceReceiver)), 1);
|
||||
}
|
||||
|
||||
function transfer_to(address payable _dest, uint _amount) public payable {
|
||||
_dest.transfer(_amount);
|
||||
}
|
||||
|
||||
function send_to(address payable _dest, uint _amount) public payable {
|
||||
require(_dest.send(_amount));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "Coinbase"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract Coinbase {
|
||||
constructor() payable {
|
||||
address coinbase = address(0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF);
|
||||
assert(block.coinbase == coinbase);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Upload": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "CreateA"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "CreateB"
|
||||
}
|
||||
},
|
||||
"value": 100000
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract CreateA {
|
||||
constructor() payable {}
|
||||
}
|
||||
|
||||
contract CreateB {
|
||||
constructor() payable {
|
||||
bytes32 salt = hex"ff";
|
||||
|
||||
try new CreateA{salt: salt}() returns (CreateA) {} catch {
|
||||
revert("the first instantiation should succeed");
|
||||
}
|
||||
|
||||
try new CreateA{salt: salt}() returns (CreateA) {} catch {
|
||||
return;
|
||||
}
|
||||
|
||||
revert("the second instantiation should have failed");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
pragma solidity ^0.8.28;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "DelegateCaller"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "e466c6c9"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract DelegateCaller {
|
||||
function delegateNoContract() external returns (bool) {
|
||||
address testAddress = 0x0000000000000000000000000000000000000000;
|
||||
(bool success, ) = testAddress.delegatecall(
|
||||
abi.encodeWithSignature("test()")
|
||||
);
|
||||
return success;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "FunctionPointer"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "26121ff0"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract FunctionPointer {
|
||||
bool public flag = false;
|
||||
|
||||
function f0() public {
|
||||
flag = true;
|
||||
}
|
||||
|
||||
function f() public returns (bool) {
|
||||
function() internal x = f0;
|
||||
x();
|
||||
return flag;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
pragma solidity ^0.8.28;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "FunctionType"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "b8c9d365"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract FunctionType {
|
||||
uint public immutable x = 42;
|
||||
|
||||
function h() public view returns (function() external view returns (uint)) {
|
||||
return this.x;
|
||||
}
|
||||
}
|
||||
@@ -26,6 +26,6 @@ pragma solidity ^0.8;
|
||||
|
||||
contract GasPrice {
|
||||
constructor() payable {
|
||||
assert(tx.gasprice == 1);
|
||||
assert(tx.gasprice == 1000);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
pragma solidity ^0.8.29;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "LayoutAt"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "a7a0d537"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "15393349"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract LayoutAt layout at 0xDEADBEEF + 0xCAFEBABE {
|
||||
uint[3] public something;
|
||||
|
||||
constructor() payable {
|
||||
something[0] = 1337;
|
||||
something[1] = 42;
|
||||
something[2] = 69;
|
||||
}
|
||||
|
||||
function slotOfSomething() public pure returns (uint ret) {
|
||||
assembly {
|
||||
ret := something.slot
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "MCopyOverlap"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "afdce848"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
function copy(
|
||||
uint dstOffset,
|
||||
uint srcOffset,
|
||||
uint length
|
||||
) pure returns (bytes memory out) {
|
||||
out = hex"2222222222222222333333333333333344444444444444445555555555555555"
|
||||
hex"6666666666666666777777777777777788888888888888889999999999999999"
|
||||
hex"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd";
|
||||
assembly {
|
||||
mcopy(
|
||||
add(add(out, 0x20), dstOffset),
|
||||
add(add(out, 0x20), srcOffset),
|
||||
length
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
contract MCopyOverlap {
|
||||
function mcopy_to_right_overlap() public pure returns (bytes memory) {
|
||||
return copy(0x20, 0x10, 0x30);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
pragma solidity ^0.8.28;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "MLoad"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "e2179b8e"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract MLoad {
|
||||
constructor() payable {
|
||||
assert(g() == 0);
|
||||
}
|
||||
|
||||
function g() public payable returns (uint m) {
|
||||
assembly {
|
||||
m := mload(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "SAR"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract SAR {
|
||||
constructor() payable {
|
||||
assert(sar(0x03, 0x01) == 0x01);
|
||||
assert(
|
||||
sar(
|
||||
0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
|
||||
0x01
|
||||
) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
);
|
||||
assert(
|
||||
sar(
|
||||
0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
|
||||
0xff
|
||||
) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
);
|
||||
assert(
|
||||
sar(
|
||||
0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
|
||||
0x100
|
||||
) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
);
|
||||
}
|
||||
|
||||
function sar(uint256 a, uint256 b) public pure returns (uint256 c) {
|
||||
assembly {
|
||||
c := sar(b, a)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": false,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
"code": {
|
||||
"Solidity": {
|
||||
"contract": "Send"
|
||||
}
|
||||
},
|
||||
"value": 211
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "1c8d16b30000000000000000000000000303030303030303030303030303030303030303000000000000000000000000000000000000000000000000000000000000000a"
|
||||
}
|
||||
},
|
||||
{
|
||||
"VerifyCall": {
|
||||
"success": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "fb9e8d050000000000000000000000000000000000000000000000000000000000000001"
|
||||
}
|
||||
},
|
||||
{
|
||||
"VerifyCall": {
|
||||
"success": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "fb9e8d050000000000000000000000000000000000000000000000000000000000000000"
|
||||
}
|
||||
},
|
||||
{
|
||||
"VerifyCall": {
|
||||
"success": false
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
*/
|
||||
|
||||
contract Send {
|
||||
constructor() payable {}
|
||||
|
||||
function transfer_self(uint _amount) public payable {
|
||||
transfer_to(payable(address(this)), _amount);
|
||||
}
|
||||
|
||||
function transfer_to(address payable _dest, uint _amount) public payable {
|
||||
if (_dest.send(_amount)) {}
|
||||
}
|
||||
|
||||
fallback() external {}
|
||||
|
||||
receive() external payable {}
|
||||
}
|
||||
@@ -3,7 +3,7 @@ pragma solidity ^0.8;
|
||||
|
||||
/* runner.json
|
||||
{
|
||||
"differential": true,
|
||||
"differential": false,
|
||||
"actions": [
|
||||
{
|
||||
"Instantiate": {
|
||||
@@ -12,7 +12,7 @@ pragma solidity ^0.8;
|
||||
"contract": "Transfer"
|
||||
}
|
||||
},
|
||||
"value": 11
|
||||
"value": 211
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -23,12 +23,35 @@ pragma solidity ^0.8;
|
||||
"data": "1c8d16b30000000000000000000000000303030303030303030303030303030303030303000000000000000000000000000000000000000000000000000000000000000a"
|
||||
}
|
||||
},
|
||||
{
|
||||
"VerifyCall": {
|
||||
"success": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "fb9e8d0500000000000000000000000003030303030303030303030303030303030303030000000000000000000000000000000000000000000000000000000000000001"
|
||||
"data": "fb9e8d050000000000000000000000000000000000000000000000000000000000000001"
|
||||
}
|
||||
},
|
||||
{
|
||||
"VerifyCall": {
|
||||
"success": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"Call": {
|
||||
"dest": {
|
||||
"Instantiated": 0
|
||||
},
|
||||
"data": "fb9e8d050000000000000000000000000000000000000000000000000000000000000000"
|
||||
}
|
||||
},
|
||||
{
|
||||
"VerifyCall": {
|
||||
"success": false
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -36,19 +59,17 @@ pragma solidity ^0.8;
|
||||
*/
|
||||
|
||||
contract Transfer {
|
||||
constructor() payable {
|
||||
transfer_self(msg.value);
|
||||
}
|
||||
|
||||
function address_self() internal view returns (address payable) {
|
||||
return payable(address(this));
|
||||
}
|
||||
constructor() payable {}
|
||||
|
||||
function transfer_self(uint _amount) public payable {
|
||||
transfer_to(address_self(), _amount);
|
||||
transfer_to(payable(address(this)), _amount);
|
||||
}
|
||||
|
||||
function transfer_to(address payable _dest, uint _amount) public payable {
|
||||
_dest.transfer(_amount);
|
||||
}
|
||||
|
||||
fallback() external {}
|
||||
|
||||
receive() external payable {}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ pragma solidity ^0.8;
|
||||
"Instantiated": 0
|
||||
},
|
||||
"key": "0000000000000000000000000000000000000000000000000000000000000000",
|
||||
"expected": "0100000000000000000000000000000000000000000000000000000000000000"
|
||||
"expected": "0000000000000000000000000000000000000000000000000000000000000001"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
use alloy_primitives::{Address, Bytes, I256, U256};
|
||||
use alloy_sol_types::{sol, SolCall, SolConstructor};
|
||||
|
||||
use revive_solidity::test_utils::*;
|
||||
use resolc::test_utils::*;
|
||||
use revive_llvm_context::OptimizerSettings;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct Contract {
|
||||
@@ -11,6 +12,26 @@ pub struct Contract {
|
||||
pub calldata: Vec<u8>,
|
||||
}
|
||||
|
||||
impl Contract {
|
||||
pub fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
|
||||
Self {
|
||||
name,
|
||||
evm_runtime: compile_evm_bin_runtime(name, code),
|
||||
pvm_runtime: compile_blob(name, code),
|
||||
calldata,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn build_size_opt(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
|
||||
Self {
|
||||
name,
|
||||
evm_runtime: compile_evm_bin_runtime(name, code),
|
||||
pvm_runtime: compile_blob_with_options(name, code, true, OptimizerSettings::size()),
|
||||
calldata,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! case {
|
||||
// Arguments:
|
||||
// 1. The file name, expect to live under "../contracts/"
|
||||
@@ -156,6 +177,20 @@ case!("DivisionArithmetics.sol", DivisionArithmetics, sdivCall, division_arithme
|
||||
case!("DivisionArithmetics.sol", DivisionArithmetics, modCall, division_arithmetics_mod, n: U256, d: U256);
|
||||
case!("DivisionArithmetics.sol", DivisionArithmetics, smodCall, division_arithmetics_smod, n: I256, d: I256);
|
||||
|
||||
sol!(
|
||||
contract Send {
|
||||
function transfer_self(uint _amount) public payable;
|
||||
}
|
||||
);
|
||||
case!("Send.sol", Send, transfer_selfCall, send_self, amount: U256);
|
||||
|
||||
sol!(
|
||||
contract Transfer {
|
||||
function transfer_self(uint _amount) public payable;
|
||||
}
|
||||
);
|
||||
case!("Transfer.sol", Transfer, transfer_selfCall, transfer_self, amount: U256);
|
||||
|
||||
sol!(
|
||||
contract MStore8 {
|
||||
function mStore8(uint value) public pure returns (uint256 word);
|
||||
@@ -235,20 +270,19 @@ sol!(
|
||||
);
|
||||
case!("Storage.sol", Storage, transientCall, storage_transient, value: U256);
|
||||
|
||||
impl Contract {
|
||||
fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
|
||||
Self {
|
||||
name,
|
||||
evm_runtime: compile_evm_bin_runtime(name, code),
|
||||
pvm_runtime: compile_blob(name, code),
|
||||
calldata,
|
||||
}
|
||||
sol!(
|
||||
contract Predicted {
|
||||
constructor(uint _foo);
|
||||
}
|
||||
}
|
||||
contract AddressPredictor {
|
||||
constructor(uint _foo, bytes memory _bytecode) payable;
|
||||
}
|
||||
);
|
||||
case!("AddressPredictor.sol", Predicted, constructorCall, predicted_constructor, salt: U256);
|
||||
case!("AddressPredictor.sol", AddressPredictor, constructorCall, address_predictor_constructor, salt: U256, bytecode: Bytes);
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use alloy_primitives::{Bytes, U256};
|
||||
use rayon::iter::{IntoParallelIterator, ParallelIterator};
|
||||
use serde::{de::Deserialize, Serialize};
|
||||
use std::{collections::BTreeMap, fs::File};
|
||||
@@ -288,14 +322,47 @@ mod tests {
|
||||
};
|
||||
|
||||
[
|
||||
Contract::baseline as fn() -> Contract,
|
||||
Contract::flipper as fn() -> Contract,
|
||||
(|| Contract::odd_product(0)) as fn() -> Contract,
|
||||
(|| Contract::fib_iterative(U256::ZERO)) as fn() -> Contract,
|
||||
Contract::erc20 as fn() -> Contract,
|
||||
(|| Contract::sha1(Bytes::new())) as fn() -> Contract,
|
||||
(|| Contract::division_arithmetics_div(U256::ZERO, U256::ZERO)) as fn() -> Contract,
|
||||
(|| Contract::event(U256::ZERO)) as fn() -> Contract,
|
||||
(|| {
|
||||
Contract::build_size_opt(
|
||||
vec![],
|
||||
"Baseline",
|
||||
include_str!("../contracts/Baseline.sol"),
|
||||
)
|
||||
}) as _,
|
||||
(|| {
|
||||
Contract::build_size_opt(
|
||||
vec![],
|
||||
"Flipper",
|
||||
include_str!("../contracts/flipper.sol"),
|
||||
)
|
||||
}) as _,
|
||||
(|| {
|
||||
Contract::build_size_opt(
|
||||
vec![],
|
||||
"Computation",
|
||||
include_str!("../contracts/Computation.sol"),
|
||||
)
|
||||
}) as _,
|
||||
(|| {
|
||||
Contract::build_size_opt(
|
||||
vec![],
|
||||
"FibonacciIterative",
|
||||
include_str!("../contracts/Fibonacci.sol"),
|
||||
)
|
||||
}) as _,
|
||||
(|| Contract::build_size_opt(vec![], "ERC20", include_str!("../contracts/ERC20.sol")))
|
||||
as _,
|
||||
(|| Contract::build_size_opt(vec![], "SHA1", include_str!("../contracts/SHA1.sol")))
|
||||
as _,
|
||||
(|| {
|
||||
Contract::build_size_opt(
|
||||
vec![],
|
||||
"DivisionArithmetics",
|
||||
include_str!("../contracts/DivisionArithmetics.sol"),
|
||||
)
|
||||
}) as _,
|
||||
(|| Contract::build_size_opt(vec![], "Events", include_str!("../contracts/Events.sol")))
|
||||
as _,
|
||||
]
|
||||
.into_par_iter()
|
||||
.map(extract_code_size)
|
||||
|
||||
@@ -33,14 +33,15 @@ test_spec!(msize, "MSize", "MSize.sol");
|
||||
test_spec!(sha1, "SHA1", "SHA1.sol");
|
||||
test_spec!(block, "Block", "Block.sol");
|
||||
test_spec!(mcopy, "MCopy", "MCopy.sol");
|
||||
test_spec!(mcopy_overlap, "MCopyOverlap", "MCopyOverlap.sol");
|
||||
test_spec!(events, "Events", "Events.sol");
|
||||
test_spec!(storage, "Storage", "Storage.sol");
|
||||
test_spec!(mstore8, "MStore8", "MStore8.sol");
|
||||
test_spec!(address, "Context", "Context.sol");
|
||||
test_spec!(balance, "Value", "Value.sol");
|
||||
test_spec!(value, "Value", "Value.sol");
|
||||
test_spec!(create, "CreateB", "Create.sol");
|
||||
test_spec!(call, "Caller", "Call.sol");
|
||||
test_spec!(transfer, "Transfer", "Transfer.sol");
|
||||
test_spec!(balance, "Balance", "Balance.sol");
|
||||
test_spec!(return_data_oob, "ReturnDataOob", "ReturnDataOob.sol");
|
||||
test_spec!(immutables, "Immutables", "Immutables.sol");
|
||||
test_spec!(transaction, "Transaction", "Transaction.sol");
|
||||
@@ -50,6 +51,17 @@ test_spec!(gas_price, "GasPrice", "GasPrice.sol");
|
||||
test_spec!(gas_left, "GasLeft", "GasLeft.sol");
|
||||
test_spec!(gas_limit, "GasLimit", "GasLimit.sol");
|
||||
test_spec!(base_fee, "BaseFee", "BaseFee.sol");
|
||||
test_spec!(coinbase, "Coinbase", "Coinbase.sol");
|
||||
test_spec!(create2, "CreateB", "Create2.sol");
|
||||
test_spec!(transfer, "Transfer", "Transfer.sol");
|
||||
test_spec!(send, "Send", "Send.sol");
|
||||
test_spec!(function_pointer, "FunctionPointer", "FunctionPointer.sol");
|
||||
test_spec!(mload, "MLoad", "MLoad.sol");
|
||||
test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
|
||||
test_spec!(function_type, "FunctionType", "FunctionType.sol");
|
||||
test_spec!(layout_at, "LayoutAt", "LayoutAt.sol");
|
||||
test_spec!(shift_arithmetic_right, "SAR", "SAR.sol");
|
||||
test_spec!(add_mod_mul_mod, "AddModMulModTester", "AddModMulMod.sol");
|
||||
|
||||
fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
|
||||
vec![Instantiate {
|
||||
@@ -61,7 +73,6 @@ fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
|
||||
path: Some(path.into()),
|
||||
contract: contract.to_string(),
|
||||
solc_optimizer: None,
|
||||
pipeline: None,
|
||||
},
|
||||
data: vec![],
|
||||
salt: OptionalHex::default(),
|
||||
@@ -354,7 +365,6 @@ fn ext_code_size() {
|
||||
path: Some("contracts/Baseline.sol".into()),
|
||||
contract: "Baseline".to_string(),
|
||||
solc_optimizer: None,
|
||||
pipeline: None,
|
||||
},
|
||||
data: vec![],
|
||||
salt: OptionalHex::from([0; 32]),
|
||||
@@ -435,32 +445,74 @@ fn ext_code_size() {
|
||||
.run();
|
||||
}
|
||||
|
||||
/*
|
||||
// These test were implement for the mock-runtime and need to be ported yet.
|
||||
#[test]
|
||||
#[should_panic(expected = "ReentranceDenied")]
|
||||
fn send_denies_reentrancy() {
|
||||
let value = 1000;
|
||||
Specs {
|
||||
actions: vec![
|
||||
instantiate("contracts/Send.sol", "Send").remove(0),
|
||||
Call {
|
||||
origin: TestAddress::Alice,
|
||||
dest: TestAddress::Instantiated(0),
|
||||
value,
|
||||
gas_limit: None,
|
||||
storage_deposit_limit: None,
|
||||
data: Contract::send_self(U256::from(value)).calldata,
|
||||
},
|
||||
],
|
||||
differential: false,
|
||||
..Default::default()
|
||||
}
|
||||
.run();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn create2_failure() {
|
||||
let mut state = State::default();
|
||||
let contract_a = Contract::create_a();
|
||||
state.upload_code(&contract_a.pvm_runtime);
|
||||
|
||||
let contract = Contract::create_b();
|
||||
let (state, output) = state
|
||||
.transaction()
|
||||
.with_default_account(&contract.pvm_runtime)
|
||||
.calldata(contract.calldata.clone())
|
||||
.call();
|
||||
|
||||
assert_eq!(output.flags, ReturnFlags::Success);
|
||||
|
||||
// The address already exists, which should cause the contract to revert
|
||||
|
||||
let (_, output) = state
|
||||
.transaction()
|
||||
.with_default_account(&contract.pvm_runtime)
|
||||
.calldata(contract.calldata)
|
||||
.call();
|
||||
|
||||
assert_eq!(output.flags, ReturnFlags::Revert);
|
||||
#[should_panic(expected = "ReentranceDenied")]
|
||||
fn transfer_denies_reentrancy() {
|
||||
let value = 1000;
|
||||
Specs {
|
||||
actions: vec![
|
||||
instantiate("contracts/Transfer.sol", "Transfer").remove(0),
|
||||
Call {
|
||||
origin: TestAddress::Alice,
|
||||
dest: TestAddress::Instantiated(0),
|
||||
value,
|
||||
gas_limit: None,
|
||||
storage_deposit_limit: None,
|
||||
data: Contract::transfer_self(U256::from(value)).calldata,
|
||||
},
|
||||
],
|
||||
differential: false,
|
||||
..Default::default()
|
||||
}
|
||||
.run();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn create2_salt() {
|
||||
let salt = U256::from(777);
|
||||
let predicted = Contract::predicted_constructor(salt).pvm_runtime;
|
||||
let predictor = Contract::address_predictor_constructor(salt, predicted.clone().into());
|
||||
Specs {
|
||||
actions: vec![
|
||||
Upload {
|
||||
origin: TestAddress::Alice,
|
||||
code: Code::Bytes(predicted),
|
||||
storage_deposit_limit: None,
|
||||
},
|
||||
Instantiate {
|
||||
origin: TestAddress::Alice,
|
||||
value: 0,
|
||||
gas_limit: Some(GAS_LIMIT),
|
||||
storage_deposit_limit: None,
|
||||
code: Code::Bytes(predictor.pvm_runtime),
|
||||
data: predictor.calldata,
|
||||
salt: OptionalHex::default(),
|
||||
},
|
||||
],
|
||||
differential: false,
|
||||
..Default::default()
|
||||
}
|
||||
.run();
|
||||
}
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revive-linker"
|
||||
version.workspace = true
|
||||
version = "0.2.0"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
@@ -8,12 +8,10 @@ authors.workspace = true
|
||||
description = "revive compiler linker utils"
|
||||
|
||||
[dependencies]
|
||||
inkwell = { workspace = true }
|
||||
tempfile = { workspace = true }
|
||||
polkavm-linker = { workspace = true }
|
||||
polkavm-common = { workspace = true }
|
||||
libc = { workspace = true }
|
||||
anyhow = { workspace = true }
|
||||
libc = { workspace = true }
|
||||
polkavm-linker = { workspace = true }
|
||||
tempfile = { workspace = true }
|
||||
|
||||
revive-builtins = { workspace = true }
|
||||
lld-sys = { workspace = true }
|
||||
revive-builtins = { workspace = true }
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
//! The revive ELF object linker library.
|
||||
|
||||
use std::{ffi::CString, fs, path::PathBuf, sync::Mutex};
|
||||
|
||||
use lld_sys::LLDELFLink;
|
||||
use tempfile::TempDir;
|
||||
|
||||
use revive_builtins::COMPILER_RT;
|
||||
|
||||
static GUARD: Mutex<()> = Mutex::new(());
|
||||
|
||||
/// The revive ELF object linker.
|
||||
pub struct ElfLinker {
|
||||
temporary_directory: TempDir,
|
||||
output_path: PathBuf,
|
||||
object_path: PathBuf,
|
||||
symbols_path: PathBuf,
|
||||
linker_script_path: PathBuf,
|
||||
}
|
||||
|
||||
impl ElfLinker {
|
||||
const LINKER_SCRIPT: &str = r#"
|
||||
SECTIONS {
|
||||
.text : { KEEP(*(.text.polkavm_export)) *(.text .text.*) }
|
||||
}"#;
|
||||
|
||||
const BUILTINS_ARCHIVE_FILE: &str = "libclang_rt.builtins-riscv64.a";
|
||||
const BUILTINS_LIB_NAME: &str = "clang_rt.builtins-riscv64";
|
||||
|
||||
/// The setup routine prepares a temporary working directory.
|
||||
pub fn setup() -> anyhow::Result<Self> {
|
||||
let temporary_directory = TempDir::new()?;
|
||||
let object_path = temporary_directory.path().join("obj.o");
|
||||
let output_path = temporary_directory.path().join("out.o");
|
||||
let symbols_path = temporary_directory.path().join("sym.o");
|
||||
let linker_script_path = temporary_directory.path().join("linker.ld");
|
||||
|
||||
fs::write(&linker_script_path, Self::LINKER_SCRIPT)
|
||||
.map_err(|message| anyhow::anyhow!("{message} {linker_script_path:?}",))?;
|
||||
|
||||
let compiler_rt_path = temporary_directory.path().join(Self::BUILTINS_ARCHIVE_FILE);
|
||||
fs::write(&compiler_rt_path, COMPILER_RT)
|
||||
.map_err(|message| anyhow::anyhow!("{message} {compiler_rt_path:?}"))?;
|
||||
|
||||
Ok(Self {
|
||||
temporary_directory,
|
||||
output_path,
|
||||
object_path,
|
||||
symbols_path,
|
||||
linker_script_path,
|
||||
})
|
||||
}
|
||||
|
||||
/// Link `input` with `symbols` and the `compiler_rt` via `LLD`.
|
||||
pub fn link<T: AsRef<[u8]>>(self, input: T, symbols: T) -> anyhow::Result<Vec<u8>> {
|
||||
fs::write(&self.object_path, input)
|
||||
.map_err(|message| anyhow::anyhow!("{message} {:?}", self.object_path))?;
|
||||
|
||||
fs::write(&self.symbols_path, symbols)
|
||||
.map_err(|message| anyhow::anyhow!("{message} {:?}", self.symbols_path))?;
|
||||
|
||||
if lld(self
|
||||
.create_arguments()
|
||||
.into_iter()
|
||||
.map(|v| v.to_string())
|
||||
.collect())
|
||||
{
|
||||
return Err(anyhow::anyhow!("ld.lld failed"));
|
||||
}
|
||||
|
||||
Ok(fs::read(&self.output_path)?)
|
||||
}
|
||||
|
||||
/// The argument creation helper function.
|
||||
fn create_arguments(&self) -> Vec<String> {
|
||||
[
|
||||
"ld.lld",
|
||||
"--error-limit=0",
|
||||
"--relocatable",
|
||||
"--emit-relocs",
|
||||
"--no-relax",
|
||||
"--unique",
|
||||
"--gc-sections",
|
||||
self.linker_script_path.to_str().expect("should be utf8"),
|
||||
"-o",
|
||||
self.output_path.to_str().expect("should be utf8"),
|
||||
self.object_path.to_str().expect("should be utf8"),
|
||||
self.symbols_path.to_str().expect("should be utf8"),
|
||||
"--library-path",
|
||||
self.temporary_directory
|
||||
.path()
|
||||
.to_str()
|
||||
.expect("should be utf8"),
|
||||
"--library",
|
||||
Self::BUILTINS_LIB_NAME,
|
||||
]
|
||||
.iter()
|
||||
.map(ToString::to_string)
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
/// The thread-safe LLD helper function.
|
||||
fn lld(arguments: Vec<String>) -> bool {
|
||||
let c_strings = arguments
|
||||
.into_iter()
|
||||
.map(|arg| CString::new(arg).expect("ld.lld args should not contain null bytes"))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let args: Vec<*const libc::c_char> = c_strings.iter().map(|arg| arg.as_ptr()).collect();
|
||||
|
||||
let _lock = GUARD.lock().expect("ICE: linker mutex should not poison");
|
||||
unsafe { LLDELFLink(args.as_ptr(), args.len()) == 0 }
|
||||
}
|
||||
@@ -1,77 +1,4 @@
|
||||
use std::{env, ffi::CString, fs};
|
||||
//! The revive ELF object to PVM blob linker library.
|
||||
|
||||
use lld_sys::LLDELFLink;
|
||||
use revive_builtins::COMPILER_RT;
|
||||
|
||||
const LINKER_SCRIPT: &str = r#"
|
||||
SECTIONS {
|
||||
.text : { KEEP(*(.text.polkavm_export)) *(.text .text.*) }
|
||||
}"#;
|
||||
|
||||
const BUILTINS_ARCHIVE_FILE: &str = "libclang_rt.builtins-riscv64.a";
|
||||
const BUILTINS_LIB_NAME: &str = "clang_rt.builtins-riscv64";
|
||||
|
||||
fn invoke_lld(cmd_args: &[&str]) -> bool {
|
||||
let c_strings = cmd_args
|
||||
.iter()
|
||||
.map(|arg| CString::new(*arg).expect("ld.lld args should not contain null bytes"))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let args: Vec<*const libc::c_char> = c_strings.iter().map(|arg| arg.as_ptr()).collect();
|
||||
|
||||
unsafe { LLDELFLink(args.as_ptr(), args.len()) == 0 }
|
||||
}
|
||||
|
||||
pub fn polkavm_linker<T: AsRef<[u8]>>(code: T, strip_binary: bool) -> anyhow::Result<Vec<u8>> {
|
||||
let mut config = polkavm_linker::Config::default();
|
||||
config.set_strip(strip_binary);
|
||||
config.set_optimize(true);
|
||||
|
||||
polkavm_linker::program_from_elf(config, code.as_ref())
|
||||
.map_err(|reason| anyhow::anyhow!("polkavm linker failed: {}", reason))
|
||||
}
|
||||
|
||||
pub fn link<T: AsRef<[u8]>>(input: T) -> anyhow::Result<Vec<u8>> {
|
||||
let dir = tempfile::tempdir().expect("failed to create temp directory for linking");
|
||||
let output_path = dir.path().join("out.so");
|
||||
let object_path = dir.path().join("out.o");
|
||||
let linker_script_path = dir.path().join("linker.ld");
|
||||
let compiler_rt_path = dir.path().join(BUILTINS_ARCHIVE_FILE);
|
||||
|
||||
fs::write(&object_path, input).map_err(|msg| anyhow::anyhow!("{msg} {object_path:?}"))?;
|
||||
|
||||
if env::var("PVM_LINKER_DUMP_OBJ").is_ok() {
|
||||
fs::copy(&object_path, "/tmp/out.o")?;
|
||||
}
|
||||
|
||||
fs::write(&linker_script_path, LINKER_SCRIPT)
|
||||
.map_err(|msg| anyhow::anyhow!("{msg} {linker_script_path:?}"))?;
|
||||
|
||||
fs::write(&compiler_rt_path, COMPILER_RT)
|
||||
.map_err(|msg| anyhow::anyhow!("{msg} {compiler_rt_path:?}"))?;
|
||||
|
||||
let ld_args = [
|
||||
"ld.lld",
|
||||
"--lto=full",
|
||||
"--error-limit=0",
|
||||
"--relocatable",
|
||||
"--emit-relocs",
|
||||
"--no-relax",
|
||||
"--unique",
|
||||
"--gc-sections",
|
||||
"--library-path",
|
||||
dir.path().to_str().expect("should be utf8"),
|
||||
"--library",
|
||||
BUILTINS_LIB_NAME,
|
||||
linker_script_path.to_str().expect("should be utf8"),
|
||||
object_path.to_str().expect("should be utf8"),
|
||||
"-o",
|
||||
output_path.to_str().expect("should be utf8"),
|
||||
];
|
||||
|
||||
if invoke_lld(&ld_args) {
|
||||
return Err(anyhow::anyhow!("ld.lld failed"));
|
||||
}
|
||||
|
||||
Ok(fs::read(&output_path)?)
|
||||
}
|
||||
pub mod elf;
|
||||
pub mod pvm;
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
//! The revive PVM blob linker library.
|
||||
|
||||
pub fn polkavm_linker<T: AsRef<[u8]>>(code: T, strip_binary: bool) -> anyhow::Result<Vec<u8>> {
|
||||
let mut config = polkavm_linker::Config::default();
|
||||
config.set_strip(strip_binary);
|
||||
config.set_optimize(true);
|
||||
|
||||
polkavm_linker::program_from_elf(config, code.as_ref())
|
||||
.map_err(|reason| anyhow::anyhow!("polkavm linker failed: {}", reason))
|
||||
}
|
||||
@@ -13,3 +13,4 @@ libc = { workspace = true }
|
||||
|
||||
[build-dependencies]
|
||||
cc = { workspace = true }
|
||||
revive-build-utils = { workspace = true }
|
||||
|
||||
+24
-33
@@ -1,34 +1,16 @@
|
||||
use std::{
|
||||
env,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
fn set_rustc_link_flags() {
|
||||
let llvm_lib_path = match std::env::var(revive_build_utils::REVIVE_LLVM_TARGET_PREFIX) {
|
||||
Ok(path) => std::path::PathBuf::from(path).join("lib"),
|
||||
_ => revive_build_utils::llvm_lib_dir(),
|
||||
};
|
||||
|
||||
const LLVM_LINK_PREFIX: &str = "LLVM_LINK_PREFIX";
|
||||
|
||||
fn locate_llvm_config() -> PathBuf {
|
||||
let prefix = env::var_os(LLVM_LINK_PREFIX)
|
||||
.map(|p| PathBuf::from(p).join("bin"))
|
||||
.unwrap_or_default();
|
||||
prefix.join("llvm-config")
|
||||
}
|
||||
|
||||
fn llvm_config(llvm_config_path: &Path, arg: &str) -> String {
|
||||
let output = std::process::Command::new(llvm_config_path)
|
||||
.args([arg])
|
||||
.output()
|
||||
.unwrap_or_else(|_| panic!("`llvm-config {arg}` failed"));
|
||||
|
||||
String::from_utf8(output.stdout)
|
||||
.unwrap_or_else(|_| panic!("output of `llvm-config {arg}` should be utf8"))
|
||||
}
|
||||
|
||||
fn set_rustc_link_flags(llvm_config_path: &Path) {
|
||||
println!(
|
||||
"cargo:rustc-link-search=native={}",
|
||||
llvm_config(llvm_config_path, "--libdir")
|
||||
llvm_lib_path.to_string_lossy()
|
||||
);
|
||||
|
||||
for lib in [
|
||||
// These are required by ld.lld
|
||||
"lldELF",
|
||||
"lldCommon",
|
||||
"lldMachO",
|
||||
@@ -91,26 +73,35 @@ fn set_rustc_link_flags(llvm_config_path: &Path) {
|
||||
}
|
||||
|
||||
let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
|
||||
let target_env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
|
||||
if target_os == "linux" {
|
||||
println!("cargo:rustc-link-lib=dylib=stdc++");
|
||||
println!("cargo:rustc-link-lib=tinfo");
|
||||
if target_env == "musl" {
|
||||
println!("cargo:rustc-link-lib=static=c++");
|
||||
} else {
|
||||
println!("cargo:rustc-link-lib=dylib=stdc++");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-env-changed={}", LLVM_LINK_PREFIX);
|
||||
println!(
|
||||
"cargo:rerun-if-env-changed={}",
|
||||
revive_build_utils::REVIVE_LLVM_HOST_PREFIX
|
||||
);
|
||||
println!(
|
||||
"cargo:rerun-if-env-changed={}",
|
||||
revive_build_utils::REVIVE_LLVM_TARGET_PREFIX
|
||||
);
|
||||
|
||||
let llvm_config_path = locate_llvm_config();
|
||||
|
||||
llvm_config(&llvm_config_path, "--cxxflags")
|
||||
revive_build_utils::llvm_cxx_flags()
|
||||
.split_whitespace()
|
||||
.fold(&mut cc::Build::new(), |builder, flag| builder.flag(flag))
|
||||
.flag("-Wno-unused-parameter")
|
||||
.warnings(false)
|
||||
.cpp(true)
|
||||
.file("src/linker.cpp")
|
||||
.compile("liblinker.a");
|
||||
|
||||
set_rustc_link_flags(&llvm_config_path);
|
||||
set_rustc_link_flags();
|
||||
|
||||
println!("cargo:rerun-if-changed=build.rs");
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
[package]
|
||||
name = "revive-llvm-builder"
|
||||
description = "revive LLVM compiler framework builder"
|
||||
authors = [
|
||||
"Oleksandr Zarudnyi <a.zarudnyy@matterlabs.dev>",
|
||||
"Anton Baliasnikov <aba@matterlabs.dev>",
|
||||
"Cyrill Leutwiler <cyrill@parity.io>",
|
||||
]
|
||||
version = "0.3.0"
|
||||
license.workspace = true
|
||||
edition.workspace = true
|
||||
repository.workspace = true
|
||||
|
||||
[[bin]]
|
||||
name = "revive-llvm"
|
||||
path = "src/revive_llvm/main.rs"
|
||||
|
||||
[lib]
|
||||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
clap = { workspace = true, features = ["help", "std", "derive"] }
|
||||
anyhow = { workspace = true }
|
||||
serde = { workspace = true, features = [ "derive" ] }
|
||||
toml = { workspace = true }
|
||||
num_cpus = { workspace = true }
|
||||
fs_extra = { workspace = true }
|
||||
path-slash = { workspace = true }
|
||||
regex = { workspace = true }
|
||||
downloader = { workspace = true }
|
||||
tar = { workspace = true }
|
||||
flate2 = { workspace = true }
|
||||
env_logger = { workspace = true }
|
||||
log = { workspace = true }
|
||||
which = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
assert_cmd = { workspace = true }
|
||||
assert_fs = { workspace = true }
|
||||
@@ -0,0 +1,137 @@
|
||||
# revive LLVM builder
|
||||
|
||||
Parity fork of the [Matter Labs zksync LLVM builder](https://github.com/matter-labs/era-compiler-llvm-builder) helper utility for compiling [revive](https://github.com/paritytech/revive) compatible LLVM builds.
|
||||
|
||||
## Installation and usage
|
||||
|
||||
The LLVM compiler framework for revive must be built with our tool called `revive-llvm`.
|
||||
This is because the revive compiler has requirements not fullfilled in upstream builds:
|
||||
- Special builds for compiling the frontend into statically linked ELF binaries and also Wasm executables
|
||||
- The RISC-V target (the PolkaVM target)
|
||||
- The compiler-rt builtins for the PolkaVM target
|
||||
- We want to leave the assertions always on
|
||||
- Various other specific configurations and optimization may be applied
|
||||
|
||||
Obtain a compatible build for your host platform from the release section of this repository (TODO). Alternatively follow below steps to get a custom build:
|
||||
|
||||
<details>
|
||||
<summary>1. Install the system prerequisites.</summary>
|
||||
|
||||
* Linux (Debian):
|
||||
|
||||
Install the following packages:
|
||||
```shell
|
||||
apt install cmake ninja-build curl git libssl-dev pkg-config clang lld
|
||||
```
|
||||
* Linux (Arch):
|
||||
|
||||
Install the following packages:
|
||||
```shell
|
||||
pacman -Syu which cmake ninja curl git pkg-config clang lld
|
||||
```
|
||||
|
||||
* MacOS:
|
||||
|
||||
* Install the [HomeBrew](https://brew.sh) package manager.
|
||||
* Install the following packages:
|
||||
|
||||
```shell
|
||||
brew install cmake ninja coreutils
|
||||
```
|
||||
|
||||
* Install your choice of a recent LLVM/[Clang](https://clang.llvm.org) compiler, e.g. via [Xcode](https://developer.apple.com/xcode/), [Apple’s Command Line Tools](https://developer.apple.com/library/archive/technotes/tn2339/_index.html), or your preferred package manager.
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>2. Install Rust.</summary>
|
||||
|
||||
* Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
|
||||
```shell
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
|
||||
. ${HOME}/.cargo/env
|
||||
```
|
||||
|
||||
> Currently we are not pinned to any specific version of Rust, so just install the latest stable build for your platform.
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>3. Install the revive LLVM framework builder.</summary>
|
||||
|
||||
* Install the builder using `cargo`:
|
||||
```shell
|
||||
cargo install --force --locked --path crates/llvm-builder
|
||||
```
|
||||
|
||||
> The builder is not the LLVM framework itself, but a tool that clones its repository and runs a sequence of build commands. By default it is installed in `~/.cargo/bin/`, which is recommended to be added to your `$PATH`.
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>4. (Optional) Create the `LLVM.lock` file.</summary>
|
||||
|
||||
* The `LLVM.lock` dictates the LLVM source tree being used.
|
||||
A default `./LLVM.lock` pointing to the release used for development is already provided.
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>5. Build LLVM.</summary>
|
||||
|
||||
* Clone and build the LLVM framework using the `revive-llvm` tool.
|
||||
|
||||
The clang and lld projects are required for the `resolc` Solidity frontend executable; they are enabled by default. LLVM assertions are also enabled by default.
|
||||
|
||||
```shell
|
||||
revive-llvm clone
|
||||
revive-llvm build --llvm-projects lld --llvm-projects clang
|
||||
```
|
||||
|
||||
Build artifacts end up in the `./target-llvm/gnu/target-final/` directory by default.
|
||||
The `gnu` directory depends on the supported archticture and will either be `gnu`, `musl` or `emscripten`.
|
||||
You now need to export the final target directory `$LLVM_SYS_181_PREFIX`:
|
||||
|
||||
```shell
|
||||
export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
|
||||
```
|
||||
|
||||
If built with the `--enable-tests` option, test tools will be in the `./target-llvm/gnu/build-final/` directory, along with copies of the build artifacts. For all supported build options, run `revive-llvm build --help`.
|
||||
|
||||
</details>
|
||||
|
||||
## Supported target architectures
|
||||
|
||||
The following target platforms are supported:
|
||||
- Linux GNU (x86)
|
||||
- Linux MUSL (x86)
|
||||
- MacOS (aarch64)
|
||||
- Windows GNU (x86)
|
||||
- Emscripten (wasm32)
|
||||
|
||||
<details>
|
||||
<summary>Building for MUSL</summary>
|
||||
|
||||
* Via a musl build we can build revive into fully static ELF binaries.
|
||||
Which is desirable for reproducible Solidity contracts builds.
|
||||
The resulting binary is also very portable, akin to the`solc` frontend binary distribution.
|
||||
|
||||
Clone and build the LLVM framework using the `revive-llvm` tool:
|
||||
```shell
|
||||
revive-llvm --target-env musl clone
|
||||
revive-llvm --target-env musl build --enable-assertions --llvm-projects clang --llvm-projects lld
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary>Building for Emscripten</summary>
|
||||
|
||||
* Via an emsdk build we can run revive in the browser and on node.js.
|
||||
|
||||
Clone and build the LLVM framework using the `revive-llvm` tool:
|
||||
```shell
|
||||
revive-llvm --target-env emscripten clone
|
||||
revive-llvm --target-env emscripten build --enable-assertions --llvm-projects clang --llvm-projects lld
|
||||
```
|
||||
|
||||
</details>
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
//! The revive LLVM build type.
|
||||
|
||||
/// The revive LLVM build type.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
|
||||
pub enum BuildType {
|
||||
/// The debug build.
|
||||
Debug,
|
||||
/// The release build.
|
||||
Release,
|
||||
/// The release with debug info build.
|
||||
RelWithDebInfo,
|
||||
/// The minimal size release build.
|
||||
MinSizeRel,
|
||||
}
|
||||
|
||||
impl std::str::FromStr for BuildType {
|
||||
type Err = String;
|
||||
|
||||
fn from_str(value: &str) -> Result<Self, Self::Err> {
|
||||
match value {
|
||||
"Debug" => Ok(Self::Debug),
|
||||
"Release" => Ok(Self::Release),
|
||||
"RelWithDebInfo" => Ok(Self::RelWithDebInfo),
|
||||
"MinSizeRel" => Ok(Self::MinSizeRel),
|
||||
value => Err(format!("Unsupported build type: `{value}`")),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for BuildType {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::Debug => write!(f, "Debug"),
|
||||
Self::Release => write!(f, "Release"),
|
||||
Self::RelWithDebInfo => write!(f, "RelWithDebInfo"),
|
||||
Self::MinSizeRel => write!(f, "MinSizeRel"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,163 @@
|
||||
//! Utilities for compiling the LLVM compiler-rt builtins.
|
||||
|
||||
use crate::utils::path_windows_to_unix as to_unix;
|
||||
use std::{env::consts::EXE_EXTENSION, process::Command};
|
||||
|
||||
/// Static CFLAGS variable passed to the compiler building the compiler-rt builtins.
|
||||
const C_FLAGS: [&str; 6] = [
|
||||
"--target=riscv64",
|
||||
"-march=rv64emac",
|
||||
"-mabi=lp64e",
|
||||
"-mcpu=generic-rv64",
|
||||
"-nostdlib",
|
||||
"-nodefaultlibs",
|
||||
];
|
||||
|
||||
/// Static CMAKE arguments for building the compiler-rt builtins.
|
||||
const CMAKE_STATIC_ARGS: [&str; 14] = [
|
||||
"-DCOMPILER_RT_BUILD_BUILTINS='On'",
|
||||
"-DCOMPILER_RT_BUILD_LIBFUZZER='Off'",
|
||||
"-DCOMPILER_RT_BUILD_MEMPROF='Off'",
|
||||
"-DCOMPILER_RT_BUILD_PROFILE='Off'",
|
||||
"-DCOMPILER_RT_BUILD_SANITIZERS='Off'",
|
||||
"-DCOMPILER_RT_BUILD_XRAY='Off'",
|
||||
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY='On'",
|
||||
"-DCOMPILER_RT_BAREMETAL_BUILD='On'",
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=1",
|
||||
"-DCMAKE_EXPORT_COMPILE_COMMANDS='On'",
|
||||
"-DCMAKE_SYSTEM_NAME='unknown'",
|
||||
"-DCMAKE_C_COMPILER_TARGET='riscv64'",
|
||||
"-DCMAKE_ASM_COMPILER_TARGET='riscv64'",
|
||||
"-DCMAKE_CXX_COMPILER_TARGET='riscv64'",
|
||||
];
|
||||
|
||||
/// Dynamic cmake arguments for building the compiler-rt builtins.
|
||||
fn cmake_dynamic_args(
|
||||
build_type: crate::BuildType,
|
||||
target_env: crate::target_env::TargetEnv,
|
||||
) -> anyhow::Result<[String; 13]> {
|
||||
let llvm_compiler_rt_target = crate::LLVMPath::llvm_target_compiler_rt()?;
|
||||
|
||||
// The Emscripten target needs to use the host LLVM tools.
|
||||
let llvm_target_host = if target_env == crate::target_env::TargetEnv::Emscripten {
|
||||
crate::LLVMPath::llvm_build_host()?
|
||||
} else {
|
||||
crate::LLVMPath::llvm_target_final()?
|
||||
};
|
||||
|
||||
let mut clang_path = llvm_target_host.to_path_buf();
|
||||
clang_path.push("bin/clang");
|
||||
clang_path.set_extension(EXE_EXTENSION);
|
||||
|
||||
let mut clangxx_path = llvm_target_host.to_path_buf();
|
||||
clangxx_path.push("bin/clang++");
|
||||
clangxx_path.set_extension(EXE_EXTENSION);
|
||||
|
||||
let mut llvm_config_path = llvm_target_host.to_path_buf();
|
||||
llvm_config_path.push("bin/llvm-config");
|
||||
llvm_config_path.set_extension(EXE_EXTENSION);
|
||||
|
||||
let mut ar_path = llvm_target_host.to_path_buf();
|
||||
ar_path.push("bin/llvm-ar");
|
||||
ar_path.set_extension(EXE_EXTENSION);
|
||||
|
||||
let mut nm_path = llvm_target_host.to_path_buf();
|
||||
nm_path.push("bin/llvm-nm");
|
||||
nm_path.set_extension(EXE_EXTENSION);
|
||||
|
||||
let mut ranlib_path = llvm_target_host.to_path_buf();
|
||||
ranlib_path.push("bin/llvm-ranlib");
|
||||
ranlib_path.set_extension(EXE_EXTENSION);
|
||||
|
||||
let mut linker_path = llvm_target_host.to_path_buf();
|
||||
linker_path.push("bin/ld.lld");
|
||||
linker_path.set_extension(EXE_EXTENSION);
|
||||
|
||||
Ok([
|
||||
format!(
|
||||
"-DCMAKE_INSTALL_PREFIX='{}'",
|
||||
llvm_compiler_rt_target.to_string_lossy().as_ref(),
|
||||
),
|
||||
format!("-DCMAKE_BUILD_TYPE='{build_type}'"),
|
||||
format!(
|
||||
"-DCOMPILER_RT_TEST_COMPILER='{}'",
|
||||
clang_path.to_string_lossy()
|
||||
),
|
||||
format!("-DCMAKE_C_FLAGS='{}'", C_FLAGS.join(" ")),
|
||||
format!("-DCMAKE_ASM_FLAGS='{}'", C_FLAGS.join(" ")),
|
||||
format!("-DCMAKE_CXX_FLAGS='{}'", C_FLAGS.join(" ")),
|
||||
format!(
|
||||
"-DCMAKE_C_COMPILER='{}'",
|
||||
to_unix(clang_path.clone())?.display()
|
||||
),
|
||||
format!("-DCMAKE_ASM_COMPILER='{}'", to_unix(clang_path)?.display()),
|
||||
format!(
|
||||
"-DCMAKE_CXX_COMPILER='{}'",
|
||||
to_unix(clangxx_path)?.display()
|
||||
),
|
||||
format!("-DCMAKE_AR='{}'", to_unix(ar_path)?.display()),
|
||||
format!("-DCMAKE_NM='{}'", to_unix(nm_path)?.display()),
|
||||
format!("-DCMAKE_RANLIB='{}'", to_unix(ranlib_path)?.display()),
|
||||
format!(
|
||||
"-DLLVM_CONFIG_PATH='{}'",
|
||||
llvm_config_path.to_string_lossy()
|
||||
),
|
||||
])
|
||||
}
|
||||
|
||||
/// Build the compiler-rt builtins library.
|
||||
pub fn build(
|
||||
build_type: crate::BuildType,
|
||||
target_env: crate::target_env::TargetEnv,
|
||||
default_target: Option<crate::TargetTriple>,
|
||||
extra_args: &[String],
|
||||
ccache_variant: Option<crate::ccache_variant::CcacheVariant>,
|
||||
sanitizer: Option<crate::sanitizer::Sanitizer>,
|
||||
) -> anyhow::Result<()> {
|
||||
log::info!("building compiler-rt for rv64emac");
|
||||
|
||||
crate::utils::check_presence("cmake")?;
|
||||
crate::utils::check_presence("ninja")?;
|
||||
|
||||
let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
|
||||
let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
|
||||
|
||||
crate::utils::command(
|
||||
std::process::Command::new("cmake")
|
||||
.args([
|
||||
"-S",
|
||||
llvm_module_compiler_rt.to_string_lossy().as_ref(),
|
||||
"-B",
|
||||
llvm_compiler_rt_build.to_string_lossy().as_ref(),
|
||||
"-G",
|
||||
"Ninja",
|
||||
])
|
||||
.args(CMAKE_STATIC_ARGS)
|
||||
.args(cmake_dynamic_args(build_type, target_env)?)
|
||||
.args(extra_args)
|
||||
.args(crate::platforms::shared::shared_build_opts_ccache(
|
||||
ccache_variant,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_default_target(
|
||||
default_target,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_sanitizers(
|
||||
sanitizer,
|
||||
)),
|
||||
"LLVM compiler-rt building cmake",
|
||||
)?;
|
||||
|
||||
crate::utils::command(
|
||||
Command::new("cmake").args([
|
||||
"--build",
|
||||
llvm_compiler_rt_build.to_string_lossy().as_ref(),
|
||||
"--target",
|
||||
"install",
|
||||
"--config",
|
||||
build_type.to_string().as_str(),
|
||||
]),
|
||||
"Building",
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
//! Compiler cache variants.
|
||||
|
||||
/// The list compiler cache variants to be used as constants.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
|
||||
pub enum CcacheVariant {
|
||||
/// Standard ccache.
|
||||
Ccache,
|
||||
/// Mozilla's sccache.
|
||||
Sccache,
|
||||
}
|
||||
|
||||
impl std::str::FromStr for CcacheVariant {
|
||||
type Err = String;
|
||||
|
||||
fn from_str(value: &str) -> Result<Self, Self::Err> {
|
||||
match value {
|
||||
"ccache" => Ok(Self::Ccache),
|
||||
"sccache" => Ok(Self::Sccache),
|
||||
value => Err(format!("Unsupported ccache variant: `{value}`")),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for CcacheVariant {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::Ccache => write!(f, "ccache"),
|
||||
Self::Sccache => write!(f, "sccache"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,339 @@
|
||||
//! The revive LLVM builder library.
|
||||
|
||||
pub mod build_type;
|
||||
pub mod builtins;
|
||||
pub mod ccache_variant;
|
||||
pub mod llvm_path;
|
||||
pub mod llvm_project;
|
||||
pub mod lock;
|
||||
pub mod platforms;
|
||||
pub mod sanitizer;
|
||||
pub mod target_env;
|
||||
pub mod target_triple;
|
||||
pub mod utils;
|
||||
|
||||
pub use self::build_type::BuildType;
|
||||
pub use self::llvm_path::LLVMPath;
|
||||
pub use self::lock::Lock;
|
||||
pub use self::platforms::Platform;
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::Command;
|
||||
pub use target_env::TargetEnv;
|
||||
pub use target_triple::TargetTriple;
|
||||
|
||||
/// Executes the LLVM repository cloning.
|
||||
pub fn clone(lock: Lock, deep: bool, target_env: TargetEnv) -> anyhow::Result<()> {
|
||||
utils::check_presence("git")?;
|
||||
|
||||
if target_env == TargetEnv::Emscripten {
|
||||
utils::install_emsdk()?;
|
||||
}
|
||||
|
||||
let destination_path = PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE);
|
||||
if destination_path.exists() {
|
||||
log::warn!(
|
||||
"LLVM repository directory {} already exists, falling back to checkout",
|
||||
destination_path.display()
|
||||
);
|
||||
return checkout(lock, false);
|
||||
}
|
||||
|
||||
let mut clone_args = vec!["clone", "--branch", lock.branch.as_str()];
|
||||
if !deep {
|
||||
clone_args.push("--depth");
|
||||
clone_args.push("1");
|
||||
}
|
||||
|
||||
utils::command(
|
||||
Command::new("git")
|
||||
.args(clone_args)
|
||||
.arg(lock.url.as_str())
|
||||
.arg(destination_path.to_string_lossy().as_ref()),
|
||||
"LLVM repository cloning",
|
||||
)?;
|
||||
|
||||
if let Some(r#ref) = lock.r#ref {
|
||||
utils::command(
|
||||
Command::new("git")
|
||||
.args(["checkout", r#ref.as_str()])
|
||||
.current_dir(destination_path.to_string_lossy().as_ref()),
|
||||
"LLVM repository commit checking out",
|
||||
)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Executes the checkout of the specified branch.
|
||||
pub fn checkout(lock: Lock, force: bool) -> anyhow::Result<()> {
|
||||
let destination_path = PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE);
|
||||
|
||||
utils::command(
|
||||
Command::new("git")
|
||||
.current_dir(destination_path.as_path())
|
||||
.args(["fetch", "--all", "--tags"]),
|
||||
"LLVM repository data fetching",
|
||||
)?;
|
||||
|
||||
if force {
|
||||
utils::command(
|
||||
Command::new("git")
|
||||
.current_dir(destination_path.as_path())
|
||||
.args(["clean", "-d", "-x", "--force"]),
|
||||
"LLVM repository cleaning",
|
||||
)?;
|
||||
}
|
||||
|
||||
utils::command(
|
||||
Command::new("git")
|
||||
.current_dir(destination_path.as_path())
|
||||
.args(["checkout", "--force", lock.branch.as_str()]),
|
||||
"LLVM repository data pulling",
|
||||
)?;
|
||||
|
||||
if let Some(r#ref) = lock.r#ref {
|
||||
let mut checkout_command = Command::new("git");
|
||||
checkout_command.current_dir(destination_path.as_path());
|
||||
checkout_command.arg("checkout");
|
||||
if force {
|
||||
checkout_command.arg("--force");
|
||||
}
|
||||
checkout_command.arg(r#ref);
|
||||
utils::command(&mut checkout_command, "LLVM repository checking out")?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Executes the building of the LLVM framework for the platform determined by the cfg macro.
|
||||
/// Since cfg is evaluated at compile time, overriding the platform with a command-line
|
||||
/// argument is not possible. So for cross-platform testing, comment out all but the
|
||||
/// line to be tested, and perhaps also checks in the platform-specific build method.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn build(
|
||||
build_type: BuildType,
|
||||
target_env: TargetEnv,
|
||||
targets: HashSet<Platform>,
|
||||
llvm_projects: HashSet<llvm_project::LLVMProject>,
|
||||
enable_rtti: bool,
|
||||
default_target: Option<TargetTriple>,
|
||||
enable_tests: bool,
|
||||
enable_coverage: bool,
|
||||
extra_args: &[String],
|
||||
ccache_variant: Option<ccache_variant::CcacheVariant>,
|
||||
enable_assertions: bool,
|
||||
sanitizer: Option<sanitizer::Sanitizer>,
|
||||
enable_valgrind: bool,
|
||||
) -> anyhow::Result<()> {
|
||||
log::trace!("build type: {build_type:?}");
|
||||
log::trace!("target env: {target_env:?}");
|
||||
log::trace!("targets: {targets:?}");
|
||||
log::trace!("llvm projects: {llvm_projects:?}");
|
||||
log::trace!("enable rtti: {enable_rtti:?}");
|
||||
log::trace!("default target: {default_target:?}");
|
||||
log::trace!("eneable tests: {enable_tests:?}");
|
||||
log::trace!("enable_coverage: {enable_coverage:?}");
|
||||
log::trace!("extra args: {extra_args:?}");
|
||||
log::trace!("sanitzer: {sanitizer:?}");
|
||||
log::trace!("enable valgrind: {enable_valgrind:?}");
|
||||
|
||||
if !PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE).exists() {
|
||||
log::error!(
|
||||
"LLVM project source directory {} does not exist (run `revive-llvm --target-env {target_env} clone`)",
|
||||
LLVMPath::DIRECTORY_LLVM_SOURCE
|
||||
)
|
||||
}
|
||||
|
||||
std::fs::create_dir_all(llvm_path::DIRECTORY_LLVM_TARGET.get().unwrap())?;
|
||||
|
||||
if cfg!(target_arch = "x86_64") {
|
||||
if cfg!(target_os = "linux") {
|
||||
if target_env == TargetEnv::MUSL {
|
||||
platforms::x86_64_linux_musl::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
enable_valgrind,
|
||||
)?;
|
||||
} else if target_env == TargetEnv::GNU {
|
||||
platforms::x86_64_linux_gnu::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
enable_valgrind,
|
||||
)?;
|
||||
} else if target_env == TargetEnv::Emscripten {
|
||||
platforms::wasm32_emscripten::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
enable_valgrind,
|
||||
)?;
|
||||
} else {
|
||||
anyhow::bail!("Unsupported target environment for x86_64 and Linux");
|
||||
}
|
||||
} else if cfg!(target_os = "macos") {
|
||||
platforms::x86_64_macos::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
)?;
|
||||
} else if cfg!(target_os = "windows") {
|
||||
platforms::x86_64_windows_msvc::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
)?;
|
||||
} else {
|
||||
anyhow::bail!("Unsupported target OS for x86_64");
|
||||
}
|
||||
} else if cfg!(target_arch = "aarch64") {
|
||||
if cfg!(target_os = "linux") {
|
||||
if target_env == TargetEnv::MUSL {
|
||||
platforms::aarch64_linux_musl::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
enable_valgrind,
|
||||
)?;
|
||||
} else if target_env == TargetEnv::GNU {
|
||||
platforms::aarch64_linux_gnu::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
enable_valgrind,
|
||||
)?;
|
||||
} else {
|
||||
anyhow::bail!("Unsupported target environment for aarch64 and Linux");
|
||||
}
|
||||
} else if cfg!(target_os = "macos") {
|
||||
if target_env == TargetEnv::Emscripten {
|
||||
platforms::wasm32_emscripten::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
enable_valgrind,
|
||||
)?;
|
||||
} else {
|
||||
platforms::aarch64_macos::build(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
)?;
|
||||
}
|
||||
} else {
|
||||
anyhow::bail!("Unsupported target OS for aarch64");
|
||||
}
|
||||
} else {
|
||||
anyhow::bail!("Unsupported target architecture");
|
||||
}
|
||||
|
||||
crate::builtins::build(
|
||||
build_type,
|
||||
target_env,
|
||||
default_target,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
sanitizer,
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Executes the build artifacts cleaning.
|
||||
pub fn clean() -> anyhow::Result<()> {
|
||||
let remove_if_exists = |path: &Path| {
|
||||
if !path.exists() {
|
||||
return Ok(());
|
||||
}
|
||||
log::info!("deleting {}", path.display());
|
||||
std::fs::remove_dir_all(path)
|
||||
};
|
||||
|
||||
remove_if_exists(
|
||||
llvm_path::DIRECTORY_LLVM_TARGET
|
||||
.get()
|
||||
.expect("target_env is always set because of the default value")
|
||||
.parent()
|
||||
.expect("target_env parent directory is target-llvm"),
|
||||
)?;
|
||||
remove_if_exists(&PathBuf::from(LLVMPath::DIRECTORY_EMSDK_SOURCE))?;
|
||||
remove_if_exists(&PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE))?;
|
||||
remove_if_exists(&PathBuf::from(LLVMPath::DIRECTORY_LLVM_HOST_SOURCE))?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,151 @@
|
||||
//! The revive LLVM builder constants.
|
||||
|
||||
use std::path::PathBuf;
|
||||
use std::sync::OnceLock;
|
||||
|
||||
pub static DIRECTORY_LLVM_TARGET: OnceLock<PathBuf> = OnceLock::new();
|
||||
|
||||
/// The LLVM path resolver.
|
||||
pub struct LLVMPath {}
|
||||
|
||||
impl LLVMPath {
|
||||
/// The LLVM source directory.
|
||||
pub const DIRECTORY_LLVM_SOURCE: &'static str = "./llvm/";
|
||||
|
||||
/// The LLVM host source directory for stage 1 of multistage MUSL and Emscripten builds.
|
||||
///
|
||||
/// We use upstream LLVM anyways; re-use the same tree for host and target builds.
|
||||
pub const DIRECTORY_LLVM_HOST_SOURCE: &'static str = Self::DIRECTORY_LLVM_SOURCE;
|
||||
|
||||
/// The Emscripten SDK source directory.
|
||||
pub const DIRECTORY_EMSDK_SOURCE: &'static str = "./emsdk/";
|
||||
|
||||
/// Returns the path to the `llvm` stage 1 host LLVM source module directory.
|
||||
pub fn llvm_host_module_llvm() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(Self::DIRECTORY_LLVM_HOST_SOURCE);
|
||||
path.push("llvm");
|
||||
crate::utils::absolute_path(path).inspect(|absolute_path| {
|
||||
log::debug!(
|
||||
"llvm stage 1 host llvm source module: {}",
|
||||
absolute_path.display()
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
/// Returns the path to the `llvm` LLVM source module directory.
|
||||
pub fn llvm_module_llvm() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(Self::DIRECTORY_LLVM_SOURCE);
|
||||
path.push("llvm");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("llvm source module: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the MUSL source.
|
||||
pub fn musl_source(name: &str) -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push(name);
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("musl source: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the MUSL build directory.
|
||||
pub fn musl_build(source_directory: &str) -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push(source_directory);
|
||||
path.push("build");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("musl build: '{}'", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM CRT build directory.
|
||||
pub fn llvm_build_crt() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push("build-crt");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("llvm build crt: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM host build directory.
|
||||
pub fn llvm_build_host() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push("build-host");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("llvm build host: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM final build directory.
|
||||
pub fn llvm_build_final() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push("build-final");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("llvm build final: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the MUSL target directory.
|
||||
pub fn musl_target() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push("target-musl");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("musl target: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM CRT target directory.
|
||||
pub fn llvm_target_crt() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push("target-crt");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("llvm crt target: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM host target directory.
|
||||
pub fn llvm_target_host() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push("target-host");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("llvm host target: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM final target directory.
|
||||
pub fn llvm_target_final() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push("target-final");
|
||||
crate::utils::absolute_path(path)
|
||||
.inspect(|absolute_path| log::debug!("llvm final target: {}", absolute_path.display()))
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM compiler builtin target directory.
|
||||
pub fn llvm_module_compiler_rt() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(Self::DIRECTORY_LLVM_SOURCE);
|
||||
path.push("compiler-rt");
|
||||
crate::utils::absolute_path(path).inspect(|absolute_path| {
|
||||
log::debug!("compiler-rt source dir: {}", absolute_path.display())
|
||||
})
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM compiler-rt target directory.
|
||||
pub fn llvm_target_compiler_rt() -> anyhow::Result<PathBuf> {
|
||||
Self::llvm_target_final()
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM compiler-rt build directory.
|
||||
pub fn llvm_build_compiler_rt() -> anyhow::Result<PathBuf> {
|
||||
let mut path = PathBuf::from(DIRECTORY_LLVM_TARGET.get().unwrap());
|
||||
path.push("build-compiler-rt");
|
||||
crate::utils::absolute_path(path).inspect(|absolute_path| {
|
||||
log::debug!("llvm compiler-rt build: {}", absolute_path.display())
|
||||
})
|
||||
}
|
||||
|
||||
/// Returns the path to the LLVM target final bin path.
|
||||
///
|
||||
pub fn llvm_target_final_bin(
|
||||
target_env: crate::target_env::TargetEnv,
|
||||
) -> anyhow::Result<PathBuf> {
|
||||
let mut path = Self::llvm_target_final()?;
|
||||
path.push("bin");
|
||||
path.push(format!("{target_env}"));
|
||||
crate::utils::absolute_path(path).inspect(|absolute_path| {
|
||||
log::debug!("llvm target final bin: {}", absolute_path.display())
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
//! The LLVM projects to enable during the build.
|
||||
|
||||
/// The list of LLVM projects used as constants.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
|
||||
pub enum LLVMProject {
|
||||
/// The Clang compiler.
|
||||
CLANG,
|
||||
/// LLD, the LLVM linker.
|
||||
LLD,
|
||||
/// The LLVM debugger.
|
||||
LLDB,
|
||||
/// The MLIR compiler.
|
||||
MLIR,
|
||||
}
|
||||
|
||||
impl std::str::FromStr for LLVMProject {
|
||||
type Err = String;
|
||||
|
||||
fn from_str(value: &str) -> Result<Self, Self::Err> {
|
||||
match value.to_lowercase().as_str() {
|
||||
"clang" => Ok(Self::CLANG),
|
||||
"lld" => Ok(Self::LLD),
|
||||
"lldb" => Ok(Self::LLDB),
|
||||
"mlir" => Ok(Self::MLIR),
|
||||
value => Err(format!("Unsupported LLVM project to enable: `{value}`")),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for LLVMProject {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::CLANG => write!(f, "clang"),
|
||||
Self::LLD => write!(f, "lld"),
|
||||
Self::LLDB => write!(f, "lldb"),
|
||||
Self::MLIR => write!(f, "mlir"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
//! The revive LLVM builder lock file.
|
||||
|
||||
use anyhow::Context;
|
||||
use std::fs::File;
|
||||
use std::io::Read;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
/// The default lock file location.
|
||||
pub const LLVM_LOCK_DEFAULT_PATH: &str = "LLVM.lock";
|
||||
|
||||
/// The lock file data.
|
||||
///
|
||||
/// This file describes the exact reference of the LLVM framework.
|
||||
#[derive(Debug, Deserialize, Serialize)]
|
||||
pub struct Lock {
|
||||
/// The LLVM repository URL.
|
||||
pub url: String,
|
||||
/// The LLVM repository branch.
|
||||
pub branch: String,
|
||||
/// The LLVM repository commit reference.
|
||||
pub r#ref: Option<String>,
|
||||
}
|
||||
|
||||
impl TryFrom<&PathBuf> for Lock {
|
||||
type Error = anyhow::Error;
|
||||
|
||||
fn try_from(path: &PathBuf) -> Result<Self, Self::Error> {
|
||||
let mut config_str = String::new();
|
||||
let mut config_file =
|
||||
File::open(path).with_context(|| format!("Error opening {path:?} file"))?;
|
||||
config_file.read_to_string(&mut config_str)?;
|
||||
Ok(toml::from_str(&config_str)?)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
//! The revive LLVM arm64 `linux-gnu` builder.
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::process::Command;
|
||||
|
||||
use crate::build_type::BuildType;
|
||||
use crate::ccache_variant::CcacheVariant;
|
||||
use crate::llvm_path::LLVMPath;
|
||||
use crate::llvm_project::LLVMProject;
|
||||
use crate::platforms::Platform;
|
||||
use crate::sanitizer::Sanitizer;
|
||||
use crate::target_triple::TargetTriple;
|
||||
|
||||
/// The building sequence.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn build(
|
||||
build_type: BuildType,
|
||||
targets: HashSet<Platform>,
|
||||
llvm_projects: HashSet<LLVMProject>,
|
||||
enable_rtti: bool,
|
||||
default_target: Option<TargetTriple>,
|
||||
enable_tests: bool,
|
||||
enable_coverage: bool,
|
||||
extra_args: &[String],
|
||||
ccache_variant: Option<CcacheVariant>,
|
||||
enable_assertions: bool,
|
||||
sanitizer: Option<Sanitizer>,
|
||||
enable_valgrind: bool,
|
||||
) -> anyhow::Result<()> {
|
||||
crate::utils::check_presence("cmake")?;
|
||||
crate::utils::check_presence("clang")?;
|
||||
crate::utils::check_presence("clang++")?;
|
||||
crate::utils::check_presence("lld")?;
|
||||
crate::utils::check_presence("ninja")?;
|
||||
|
||||
let llvm_module_llvm = LLVMPath::llvm_module_llvm()?;
|
||||
let llvm_build_final = LLVMPath::llvm_build_final()?;
|
||||
let llvm_target_final = LLVMPath::llvm_target_final()?;
|
||||
|
||||
crate::utils::command(
|
||||
Command::new("cmake")
|
||||
.args([
|
||||
"-S",
|
||||
llvm_module_llvm.to_string_lossy().as_ref(),
|
||||
"-B",
|
||||
llvm_build_final.to_string_lossy().as_ref(),
|
||||
"-G",
|
||||
"Ninja",
|
||||
format!(
|
||||
"-DCMAKE_INSTALL_PREFIX='{}'",
|
||||
llvm_target_final.to_string_lossy().as_ref(),
|
||||
)
|
||||
.as_str(),
|
||||
format!("-DCMAKE_BUILD_TYPE='{build_type}'").as_str(),
|
||||
"-DCMAKE_C_COMPILER='clang'",
|
||||
"-DCMAKE_CXX_COMPILER='clang++'",
|
||||
format!(
|
||||
"-DLLVM_TARGETS_TO_BUILD='{}'",
|
||||
targets
|
||||
.into_iter()
|
||||
.map(|platform| platform.to_string())
|
||||
.collect::<Vec<String>>()
|
||||
.join(";")
|
||||
)
|
||||
.as_str(),
|
||||
format!(
|
||||
"-DLLVM_ENABLE_PROJECTS='{}'",
|
||||
llvm_projects
|
||||
.into_iter()
|
||||
.map(|project| project.to_string())
|
||||
.collect::<Vec<String>>()
|
||||
.join(";")
|
||||
)
|
||||
.as_str(),
|
||||
"-DLLVM_USE_LINKER='lld'",
|
||||
])
|
||||
.args(crate::platforms::shared::shared_build_opts_default_target(
|
||||
default_target,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_tests(
|
||||
enable_tests,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_coverage(
|
||||
enable_coverage,
|
||||
))
|
||||
.args(crate::platforms::shared::SHARED_BUILD_OPTS)
|
||||
.args(crate::platforms::shared::SHARED_BUILD_OPTS_NOT_MUSL)
|
||||
.args(crate::platforms::shared::shared_build_opts_werror(
|
||||
crate::target_env::TargetEnv::GNU,
|
||||
))
|
||||
.args(extra_args)
|
||||
.args(crate::platforms::shared::shared_build_opts_ccache(
|
||||
ccache_variant,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_assertions(
|
||||
enable_assertions,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_rtti(
|
||||
enable_rtti,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_sanitizers(
|
||||
sanitizer,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_valgrind(
|
||||
enable_valgrind,
|
||||
)),
|
||||
"LLVM building cmake",
|
||||
)?;
|
||||
crate::utils::ninja(llvm_build_final.as_ref())?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,394 @@
|
||||
//! The revive LLVM arm64 `linux-musl` builder.
|
||||
|
||||
use crate::build_type::BuildType;
|
||||
use crate::ccache_variant::CcacheVariant;
|
||||
use crate::llvm_path::LLVMPath;
|
||||
use crate::llvm_project::LLVMProject;
|
||||
use crate::platforms::Platform;
|
||||
use crate::sanitizer::Sanitizer;
|
||||
use crate::target_triple::TargetTriple;
|
||||
use std::collections::HashSet;
|
||||
use std::path::Path;
|
||||
use std::process::Command;
|
||||
|
||||
/// The building sequence.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn build(
|
||||
build_type: BuildType,
|
||||
targets: HashSet<Platform>,
|
||||
llvm_projects: HashSet<LLVMProject>,
|
||||
enable_rtti: bool,
|
||||
default_target: Option<TargetTriple>,
|
||||
enable_tests: bool,
|
||||
enable_coverage: bool,
|
||||
extra_args: &[String],
|
||||
ccache_variant: Option<CcacheVariant>,
|
||||
enable_assertions: bool,
|
||||
sanitizer: Option<Sanitizer>,
|
||||
enable_valgrind: bool,
|
||||
) -> anyhow::Result<()> {
|
||||
crate::utils::check_presence("cmake")?;
|
||||
crate::utils::check_presence("clang")?;
|
||||
crate::utils::check_presence("clang++")?;
|
||||
crate::utils::check_presence("lld")?;
|
||||
crate::utils::check_presence("ninja")?;
|
||||
|
||||
let musl_name = "musl-1.2.3";
|
||||
let musl_build = LLVMPath::musl_build(musl_name)?;
|
||||
let musl_target = LLVMPath::musl_target()?;
|
||||
|
||||
let llvm_module_llvm = LLVMPath::llvm_module_llvm()?;
|
||||
let llvm_host_module_llvm = LLVMPath::llvm_host_module_llvm()?;
|
||||
|
||||
let llvm_build_crt = LLVMPath::llvm_build_crt()?;
|
||||
let llvm_target_crt = LLVMPath::llvm_target_crt()?;
|
||||
|
||||
let llvm_build_host = LLVMPath::llvm_build_host()?;
|
||||
let llvm_target_host = LLVMPath::llvm_target_host()?;
|
||||
|
||||
let llvm_build_final = LLVMPath::llvm_build_final()?;
|
||||
let llvm_target_final = LLVMPath::llvm_target_final()?;
|
||||
|
||||
if !LLVMPath::musl_source(musl_name)?.exists() {
|
||||
crate::utils::download_musl(musl_name)?;
|
||||
}
|
||||
crate::platforms::shared::build_musl(musl_build.as_path(), musl_target.as_path())?;
|
||||
build_crt(
|
||||
targets.clone(),
|
||||
llvm_host_module_llvm.as_path(),
|
||||
llvm_build_crt.as_path(),
|
||||
llvm_target_crt.as_path(),
|
||||
ccache_variant,
|
||||
)?;
|
||||
build_host(
|
||||
llvm_host_module_llvm.as_path(),
|
||||
llvm_build_host.as_path(),
|
||||
llvm_target_host.as_path(),
|
||||
musl_target.as_path(),
|
||||
llvm_target_crt.as_path(),
|
||||
ccache_variant,
|
||||
)?;
|
||||
build_target(
|
||||
build_type,
|
||||
targets,
|
||||
llvm_projects,
|
||||
enable_rtti,
|
||||
default_target,
|
||||
llvm_module_llvm.as_path(),
|
||||
llvm_build_final.as_path(),
|
||||
llvm_target_final.as_path(),
|
||||
musl_target.as_path(),
|
||||
llvm_target_host.as_path(),
|
||||
enable_tests,
|
||||
enable_coverage,
|
||||
extra_args,
|
||||
ccache_variant,
|
||||
enable_assertions,
|
||||
sanitizer,
|
||||
enable_valgrind,
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
///
|
||||
/// The `crt` building sequence.
|
||||
///
|
||||
fn build_crt(
|
||||
mut targets: HashSet<Platform>,
|
||||
source_directory: &Path,
|
||||
build_directory: &Path,
|
||||
target_directory: &Path,
|
||||
ccache_variant: Option<CcacheVariant>,
|
||||
) -> anyhow::Result<()> {
|
||||
targets.insert(Platform::AArch64);
|
||||
|
||||
crate::utils::command(
|
||||
Command::new("cmake")
|
||||
.args([
|
||||
"-S",
|
||||
source_directory.to_string_lossy().as_ref(),
|
||||
"-B",
|
||||
build_directory.to_string_lossy().as_ref(),
|
||||
"-G",
|
||||
"Ninja",
|
||||
format!(
|
||||
"-DCMAKE_INSTALL_PREFIX='{}'",
|
||||
target_directory.to_string_lossy()
|
||||
)
|
||||
.as_str(),
|
||||
"-DCMAKE_BUILD_TYPE='Release'",
|
||||
"-DCMAKE_C_COMPILER='clang'",
|
||||
"-DCMAKE_CXX_COMPILER='clang++'",
|
||||
"-DLLVM_ENABLE_PROJECTS='compiler-rt'",
|
||||
format!("-DLLVM_TARGETS_TO_BUILD='{}'", Platform::AArch64).as_str(),
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE='aarch64-unknown-linux-musl'",
|
||||
"-DLLVM_BUILD_TESTS='Off'",
|
||||
"-DLLVM_BUILD_RUNTIMES='Off'",
|
||||
"-DLLVM_BUILD_UTILS='Off'",
|
||||
"-DLLVM_INCLUDE_TESTS='Off'",
|
||||
"-DLLVM_INCLUDE_RUNTIMES='Off'",
|
||||
"-DLLVM_INCLUDE_UTILS='Off'",
|
||||
"-DCOMPILER_RT_DEFAULT_TARGET_ARCH='aarch64'",
|
||||
"-DCOMPILER_RT_BUILD_CRT='On'",
|
||||
"-DCOMPILER_RT_BUILD_BUILTINS='On'",
|
||||
"-DCOMPILER_RT_BUILD_SANITIZERS='Off'",
|
||||
"-DCOMPILER_RT_BUILD_XRAY='Off'",
|
||||
"-DCOMPILER_RT_BUILD_LIBFUZZER='Off'",
|
||||
"-DCOMPILER_RT_BUILD_PROFILE='Off'",
|
||||
"-DCOMPILER_RT_BUILD_MEMPROF='Off'",
|
||||
"-DCOMPILER_RT_BUILD_ORC='Off'",
|
||||
])
|
||||
.args(crate::platforms::shared::SHARED_BUILD_OPTS)
|
||||
.args(crate::platforms::shared::shared_build_opts_ccache(
|
||||
ccache_variant,
|
||||
)),
|
||||
"CRT building cmake",
|
||||
)?;
|
||||
|
||||
crate::utils::command(
|
||||
Command::new("ninja")
|
||||
.arg("-C")
|
||||
.arg(build_directory)
|
||||
.arg("install-crt"),
|
||||
"CRT building ninja",
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
///
|
||||
/// The host toolchain building sequence.
|
||||
///
|
||||
fn build_host(
|
||||
source_directory: &Path,
|
||||
build_directory: &Path,
|
||||
target_directory: &Path,
|
||||
musl_target_directory: &Path,
|
||||
crt_target_directory: &Path,
|
||||
ccache_variant: Option<CcacheVariant>,
|
||||
) -> anyhow::Result<()> {
|
||||
crate::utils::command(
|
||||
Command::new("cmake")
|
||||
.args([
|
||||
"-S",
|
||||
source_directory.to_string_lossy().as_ref(),
|
||||
"-B",
|
||||
build_directory.to_string_lossy().as_ref(),
|
||||
"-G",
|
||||
"Ninja",
|
||||
format!(
|
||||
"-DDEFAULT_SYSROOT='{}'",
|
||||
musl_target_directory.to_string_lossy()
|
||||
)
|
||||
.as_str(),
|
||||
"-DLINKER_SUPPORTS_COLOR_DIAGNOSTICS=0",
|
||||
format!(
|
||||
"-DCMAKE_INSTALL_PREFIX='{}'",
|
||||
target_directory.to_string_lossy()
|
||||
)
|
||||
.as_str(),
|
||||
"-DCMAKE_BUILD_TYPE='Release'",
|
||||
"-DCMAKE_C_COMPILER='clang'",
|
||||
"-DCMAKE_CXX_COMPILER='clang++'",
|
||||
"-DCLANG_DEFAULT_CXX_STDLIB='libc++'",
|
||||
"-DCLANG_DEFAULT_RTLIB='compiler-rt'",
|
||||
"-DLLVM_DEFAULT_TARGET_TRIPLE='aarch64-unknown-linux-musl'",
|
||||
"-DLLVM_TARGETS_TO_BUILD='AArch64'",
|
||||
"-DLLVM_BUILD_TESTS='Off'",
|
||||
"-DLLVM_BUILD_UTILS='Off'",
|
||||
"-DLLVM_INCLUDE_TESTS='Off'",
|
||||
"-DLLVM_INCLUDE_UTILS='Off'",
|
||||
"-DLLVM_ENABLE_PROJECTS='clang;lld'",
|
||||
"-DLLVM_ENABLE_RUNTIMES='compiler-rt;libcxx;libcxxabi;libunwind'",
|
||||
"-DLIBCXX_CXX_ABI='libcxxabi'",
|
||||
"-DLIBCXX_HAS_MUSL_LIBC='On'",
|
||||
"-DLIBCXX_ENABLE_SHARED='Off'",
|
||||
"-DLIBCXX_ENABLE_STATIC='On'",
|
||||
"-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY='On'",
|
||||
"-DLIBCXXABI_ENABLE_SHARED='Off'",
|
||||
"-DLIBCXXABI_ENABLE_STATIC='On'",
|
||||
"-DLIBCXXABI_ENABLE_STATIC_UNWINDER='On'",
|
||||
"-DLIBCXXABI_USE_LLVM_UNWINDER='On'",
|
||||
"-DLIBCXXABI_USE_COMPILER_RT='On'",
|
||||
"-DLIBUNWIND_ENABLE_STATIC='On'",
|
||||
"-DLIBUNWIND_ENABLE_SHARED='Off'",
|
||||
"-DCOMPILER_RT_BUILD_CRT='On'",
|
||||
"-DCOMPILER_RT_BUILD_SANITIZERS='Off'",
|
||||
"-DCOMPILER_RT_BUILD_XRAY='Off'",
|
||||
"-DCOMPILER_RT_BUILD_LIBFUZZER='Off'",
|
||||
"-DCOMPILER_RT_BUILD_PROFILE='On'",
|
||||
"-DCOMPILER_RT_BUILD_MEMPROF='Off'",
|
||||
"-DCOMPILER_RT_BUILD_ORC='Off'",
|
||||
"-DCOMPILER_RT_DEFAULT_TARGET_ARCH='aarch64'",
|
||||
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY='On'",
|
||||
])
|
||||
.args(crate::platforms::shared::SHARED_BUILD_OPTS)
|
||||
.args(crate::platforms::shared::shared_build_opts_ccache(
|
||||
ccache_variant,
|
||||
)),
|
||||
"LLVM host building cmake",
|
||||
)?;
|
||||
|
||||
let mut crt_lib_directory = crt_target_directory.to_path_buf();
|
||||
crt_lib_directory.push("lib/");
|
||||
|
||||
let mut build_lib_directory = build_directory.to_path_buf();
|
||||
build_lib_directory.push("lib/");
|
||||
|
||||
let copy_options = fs_extra::dir::CopyOptions {
|
||||
overwrite: true,
|
||||
copy_inside: true,
|
||||
content_only: true,
|
||||
..Default::default()
|
||||
};
|
||||
fs_extra::dir::copy(crt_lib_directory, build_lib_directory, ©_options)?;
|
||||
|
||||
crate::utils::command(
|
||||
Command::new("ninja")
|
||||
.arg("-C")
|
||||
.arg(build_directory)
|
||||
.arg("install"),
|
||||
"LLVM host building ninja",
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
///
|
||||
/// The target toolchain building sequence.
|
||||
///
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn build_target(
|
||||
build_type: BuildType,
|
||||
targets: HashSet<Platform>,
|
||||
llvm_projects: HashSet<LLVMProject>,
|
||||
enable_rtti: bool,
|
||||
default_target: Option<TargetTriple>,
|
||||
source_directory: &Path,
|
||||
build_directory: &Path,
|
||||
target_directory: &Path,
|
||||
musl_target_directory: &Path,
|
||||
host_target_directory: &Path,
|
||||
enable_tests: bool,
|
||||
enable_coverage: bool,
|
||||
extra_args: &[String],
|
||||
ccache_variant: Option<CcacheVariant>,
|
||||
enable_assertions: bool,
|
||||
sanitizer: Option<Sanitizer>,
|
||||
enable_valgrind: bool,
|
||||
) -> anyhow::Result<()> {
|
||||
let mut clang_path = host_target_directory.to_path_buf();
|
||||
clang_path.push("bin/clang");
|
||||
|
||||
let mut clang_cxx_path = host_target_directory.to_path_buf();
|
||||
clang_cxx_path.push("bin/clang++");
|
||||
|
||||
crate::utils::command(
|
||||
Command::new("cmake")
|
||||
.args([
|
||||
"-S",
|
||||
source_directory.to_string_lossy().as_ref(),
|
||||
"-B",
|
||||
build_directory.to_string_lossy().as_ref(),
|
||||
"-G",
|
||||
"Ninja",
|
||||
"-DBUILD_SHARED_LIBS='Off'",
|
||||
"-DLINKER_SUPPORTS_COLOR_DIAGNOSTICS=0",
|
||||
format!(
|
||||
"-DCMAKE_INSTALL_PREFIX='{}'",
|
||||
target_directory.to_string_lossy()
|
||||
)
|
||||
.as_str(),
|
||||
format!("-DCMAKE_BUILD_TYPE='{build_type}'").as_str(),
|
||||
format!("-DCMAKE_C_COMPILER='{}'", clang_path.to_string_lossy()).as_str(),
|
||||
format!(
|
||||
"-DCMAKE_CXX_COMPILER='{}'",
|
||||
clang_cxx_path.to_string_lossy()
|
||||
)
|
||||
.as_str(),
|
||||
"-DCMAKE_FIND_LIBRARY_SUFFIXES='.a'",
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=1",
|
||||
"-DCMAKE_EXE_LINKER_FLAGS='-fuse-ld=lld -static'",
|
||||
format!(
|
||||
"-DLLVM_TARGETS_TO_BUILD='{}'",
|
||||
targets
|
||||
.into_iter()
|
||||
.map(|platform| platform.to_string())
|
||||
.collect::<Vec<String>>()
|
||||
.join(";")
|
||||
)
|
||||
.as_str(),
|
||||
format!(
|
||||
"-DLLVM_ENABLE_PROJECTS='{}'",
|
||||
llvm_projects
|
||||
.into_iter()
|
||||
.map(|project| project.to_string())
|
||||
.collect::<Vec<String>>()
|
||||
.join(";")
|
||||
)
|
||||
.as_str(),
|
||||
])
|
||||
.args(crate::platforms::shared::shared_build_opts_default_target(
|
||||
default_target,
|
||||
))
|
||||
.args(crate::platforms::shared::SHARED_BUILD_OPTS)
|
||||
.args(crate::platforms::shared::SHARED_BUILD_OPTS_NOT_MUSL)
|
||||
.args(crate::platforms::shared::shared_build_opts_werror(
|
||||
crate::target_env::TargetEnv::MUSL,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_tests(
|
||||
enable_tests,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_coverage(
|
||||
enable_coverage,
|
||||
))
|
||||
.args(extra_args)
|
||||
.args(crate::platforms::shared::shared_build_opts_ccache(
|
||||
ccache_variant,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_assertions(
|
||||
enable_assertions,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_rtti(
|
||||
enable_rtti,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_sanitizers(
|
||||
sanitizer,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_valgrind(
|
||||
enable_valgrind,
|
||||
)),
|
||||
"LLVM target building cmake",
|
||||
)?;
|
||||
|
||||
crate::utils::ninja(build_directory)?;
|
||||
|
||||
let mut musl_lib_directory = musl_target_directory.to_path_buf();
|
||||
musl_lib_directory.push("lib/");
|
||||
|
||||
let mut host_lib_directory = host_target_directory.to_path_buf();
|
||||
host_lib_directory.push("lib/aarch64-unknown-linux-musl/");
|
||||
|
||||
let mut target_lib_directory = target_directory.to_path_buf();
|
||||
target_lib_directory.push("lib/");
|
||||
|
||||
let copy_options = fs_extra::dir::CopyOptions {
|
||||
overwrite: true,
|
||||
copy_inside: true,
|
||||
content_only: true,
|
||||
..Default::default()
|
||||
};
|
||||
fs_extra::dir::copy(
|
||||
musl_lib_directory,
|
||||
target_lib_directory.as_path(),
|
||||
©_options,
|
||||
)?;
|
||||
fs_extra::dir::copy(
|
||||
host_lib_directory,
|
||||
target_lib_directory.as_path(),
|
||||
©_options,
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
//! The revive LLVM arm64 `macos-aarch64` builder.
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::process::Command;
|
||||
|
||||
use crate::build_type::BuildType;
|
||||
use crate::ccache_variant::CcacheVariant;
|
||||
use crate::llvm_path::LLVMPath;
|
||||
use crate::llvm_project::LLVMProject;
|
||||
use crate::platforms::Platform;
|
||||
use crate::sanitizer::Sanitizer;
|
||||
use crate::target_triple::TargetTriple;
|
||||
|
||||
/// The building sequence.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn build(
|
||||
build_type: BuildType,
|
||||
targets: HashSet<Platform>,
|
||||
llvm_projects: HashSet<LLVMProject>,
|
||||
enable_rtti: bool,
|
||||
default_target: Option<TargetTriple>,
|
||||
enable_tests: bool,
|
||||
enable_coverage: bool,
|
||||
extra_args: &[String],
|
||||
ccache_variant: Option<CcacheVariant>,
|
||||
enable_assertions: bool,
|
||||
sanitizer: Option<Sanitizer>,
|
||||
) -> anyhow::Result<()> {
|
||||
crate::utils::check_presence("cmake")?;
|
||||
crate::utils::check_presence("ninja")?;
|
||||
|
||||
let llvm_module_llvm = LLVMPath::llvm_module_llvm()?;
|
||||
let llvm_build_final = LLVMPath::llvm_build_final()?;
|
||||
let llvm_target_final = LLVMPath::llvm_target_final()?;
|
||||
|
||||
crate::utils::command(
|
||||
Command::new("cmake")
|
||||
.args([
|
||||
"-S",
|
||||
llvm_module_llvm.to_string_lossy().as_ref(),
|
||||
"-B",
|
||||
llvm_build_final.to_string_lossy().as_ref(),
|
||||
"-G",
|
||||
"Ninja",
|
||||
format!(
|
||||
"-DCMAKE_INSTALL_PREFIX='{}'",
|
||||
llvm_target_final.to_string_lossy().as_ref(),
|
||||
)
|
||||
.as_str(),
|
||||
format!("-DCMAKE_BUILD_TYPE='{build_type}'").as_str(),
|
||||
format!(
|
||||
"-DLLVM_TARGETS_TO_BUILD='{}'",
|
||||
targets
|
||||
.into_iter()
|
||||
.map(|platform| platform.to_string())
|
||||
.collect::<Vec<String>>()
|
||||
.join(";")
|
||||
)
|
||||
.as_str(),
|
||||
format!(
|
||||
"-DLLVM_ENABLE_PROJECTS='{}'",
|
||||
llvm_projects
|
||||
.into_iter()
|
||||
.map(|project| project.to_string())
|
||||
.collect::<Vec<String>>()
|
||||
.join(";")
|
||||
)
|
||||
.as_str(),
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET='11.0'",
|
||||
])
|
||||
.args(crate::platforms::shared::shared_build_opts_default_target(
|
||||
default_target,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_tests(
|
||||
enable_tests,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_coverage(
|
||||
enable_coverage,
|
||||
))
|
||||
.args(crate::platforms::shared::SHARED_BUILD_OPTS)
|
||||
.args(crate::platforms::shared::SHARED_BUILD_OPTS_NOT_MUSL)
|
||||
.args(crate::platforms::shared::shared_build_opts_werror(
|
||||
crate::target_env::TargetEnv::GNU,
|
||||
))
|
||||
.args(extra_args)
|
||||
.args(crate::platforms::shared::shared_build_opts_ccache(
|
||||
ccache_variant,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_assertions(
|
||||
enable_assertions,
|
||||
))
|
||||
.args(crate::platforms::shared::shared_build_opts_rtti(
|
||||
enable_rtti,
|
||||
))
|
||||
.args(crate::platforms::shared::macos_build_opts_ignore_dupicate_libs_warnings())
|
||||
.args(crate::platforms::shared::shared_build_opts_sanitizers(
|
||||
sanitizer,
|
||||
)),
|
||||
"LLVM building cmake",
|
||||
)?;
|
||||
|
||||
crate::utils::ninja(llvm_build_final.as_ref())?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user