diff --git a/bazel/testing/lit.cfg.py b/bazel/testing/lit.cfg.py index 77344051a962..c2109bc256ba 100644 --- a/bazel/testing/lit.cfg.py +++ b/bazel/testing/lit.cfg.py @@ -47,7 +47,7 @@ def add_substitutions(): add_substitution("carbon", f"{run_carbon}") add_substitution( - "carbon-run-lower", + "carbon-run-lowering", f"{run_carbon} dump llvm-ir %s | {filecheck_strict}", ) add_substitution( diff --git a/toolchain/driver/BUILD b/toolchain/driver/BUILD index 4bd83c13ad3e..00d0924ad80a 100644 --- a/toolchain/driver/BUILD +++ b/toolchain/driver/BUILD @@ -19,7 +19,7 @@ cc_library( "//toolchain/diagnostics:diagnostic_emitter", "//toolchain/diagnostics:sorting_diagnostic_consumer", "//toolchain/lexer:tokenized_buffer", - "//toolchain/lower", + "//toolchain/lowering:lower_to_llvm", "//toolchain/parser:parse_tree", "//toolchain/semantics:semantics_ir", "//toolchain/source:source_buffer", diff --git a/toolchain/driver/driver.cpp b/toolchain/driver/driver.cpp index 10098f268478..e7ab7b22742c 100644 --- a/toolchain/driver/driver.cpp +++ b/toolchain/driver/driver.cpp @@ -15,7 +15,7 @@ #include "llvm/Support/Format.h" #include "toolchain/diagnostics/sorting_diagnostic_consumer.h" #include "toolchain/lexer/tokenized_buffer.h" -#include "toolchain/lower/lower.h" +#include "toolchain/lowering/lower_to_llvm.h" #include "toolchain/parser/parse_tree.h" #include "toolchain/semantics/semantics_ir.h" #include "toolchain/source/source_buffer.h" @@ -209,11 +209,11 @@ auto Driver::RunDumpSubcommand(DiagnosticConsumer& consumer, } CARBON_VLOG() << "semantics_ir: " << semantics_ir; - CARBON_VLOG() << "*** Lower::Make ***\n"; + CARBON_VLOG() << "*** LowerToLLVM ***\n"; llvm::LLVMContext llvm_context; const std::unique_ptr module = - Lower::Make(llvm_context, input_file_name, semantics_ir); - CARBON_VLOG() << "*** Lower::Make done ***\n"; + LowerToLLVM(llvm_context, input_file_name, semantics_ir); + CARBON_VLOG() << "*** LowerToLLVM done ***\n"; if (dump_mode == DumpMode::LLVMIR) { consumer.Flush(); module->print(output_stream_, /*AAW=*/nullptr, diff --git a/toolchain/lower/testdata/basics/empty.carbon b/toolchain/lower/testdata/basics/empty.carbon deleted file mode 100644 index 43686fa389ed..000000000000 --- a/toolchain/lower/testdata/basics/empty.carbon +++ /dev/null @@ -1,8 +0,0 @@ -// Part of the Carbon Language project, under the Apache License v2.0 with LLVM -// Exceptions. See /LICENSE for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -// AUTOUPDATE -// RUN: %{carbon-run-lower} -// CHECK:STDOUT: ; ModuleID = '{{.*}}/toolchain/lower/testdata/basics/empty.carbon' -// CHECK:STDOUT: source_filename = "{{.*}}/toolchain/lower/testdata/basics/empty.carbon" diff --git a/toolchain/lower/BUILD b/toolchain/lowering/BUILD similarity index 82% rename from toolchain/lower/BUILD rename to toolchain/lowering/BUILD index b5ac383dcdb4..4d8a70f96d70 100644 --- a/toolchain/lower/BUILD +++ b/toolchain/lowering/BUILD @@ -5,9 +5,9 @@ package(default_visibility = ["//visibility:public"]) cc_library( - name = "lower", - srcs = ["lower.cpp"], - hdrs = ["lower.h"], + name = "lower_to_llvm", + srcs = ["lower_to_llvm.cpp"], + hdrs = ["lower_to_llvm.h"], deps = [ "//common:check", "//common:ostream", diff --git a/toolchain/lower/__init__.py b/toolchain/lowering/__init__.py similarity index 100% rename from toolchain/lower/__init__.py rename to toolchain/lowering/__init__.py diff --git a/toolchain/lower/lit_autoupdate.py b/toolchain/lowering/lit_autoupdate.py similarity index 85% rename from toolchain/lower/lit_autoupdate.py rename to toolchain/lowering/lit_autoupdate.py index 54783c07cf66..2fa0fb1cdde1 100755 --- a/toolchain/lower/lit_autoupdate.py +++ b/toolchain/lowering/lit_autoupdate.py @@ -22,12 +22,12 @@ def main() -> None: ) args = [ sys.argv[0], - # Flags to configure for lower testing. + # Flags to configure for lowering testing. "--tool=carbon", "--autoupdate_arg=dump", "--autoupdate_arg=llvm-ir", - "--lit_run=%{carbon-run-lower}", - "--testdata=toolchain/lower/testdata", + "--lit_run=%{carbon-run-lowering}", + "--testdata=toolchain/lowering/testdata", ] + sys.argv[1:] os.execv(actual_py, args) diff --git a/toolchain/lower/lower.cpp b/toolchain/lowering/lower_to_llvm.cpp similarity index 80% rename from toolchain/lower/lower.cpp rename to toolchain/lowering/lower_to_llvm.cpp index 88954377fced..294140e4a84f 100644 --- a/toolchain/lower/lower.cpp +++ b/toolchain/lowering/lower_to_llvm.cpp @@ -2,11 +2,11 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/lower/lower.h" +#include "toolchain/lowering/lower_to_llvm.h" namespace Carbon { -auto Lower::Make(llvm::LLVMContext& llvm_context, llvm::StringRef module_name, +auto LowerToLLVM(llvm::LLVMContext& llvm_context, llvm::StringRef module_name, const SemanticsIR& /*semantics_ir*/) -> std::unique_ptr { auto result = std::make_unique(module_name, llvm_context); diff --git a/toolchain/lower/lower.h b/toolchain/lowering/lower_to_llvm.h similarity index 55% rename from toolchain/lower/lower.h rename to toolchain/lowering/lower_to_llvm.h index 2097e0e6bb38..1c02ff6a7c18 100644 --- a/toolchain/lower/lower.h +++ b/toolchain/lowering/lower_to_llvm.h @@ -2,8 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_LOWER_LOWER_H_ -#define CARBON_TOOLCHAIN_LOWER_LOWER_H_ +#ifndef CARBON_TOOLCHAIN_LOWERING_LOWER_TO_LLVM_H_ +#define CARBON_TOOLCHAIN_LOWERING_LOWER_TO_LLVM_H_ #include "common/ostream.h" #include "llvm/IR/LLVMContext.h" @@ -13,13 +13,10 @@ namespace Carbon { // Lowers Semantics IR to LLVM IR. -class Lower { - public: - static auto Make(llvm::LLVMContext& llvm_context, llvm::StringRef module_name, - const SemanticsIR& semantics_ir) - -> std::unique_ptr; -}; +auto LowerToLLVM(llvm::LLVMContext& llvm_context, llvm::StringRef module_name, + const SemanticsIR& semantics_ir) + -> std::unique_ptr; } // namespace Carbon -#endif // CARBON_TOOLCHAIN_LOWER_LOWER_H_ +#endif // CARBON_TOOLCHAIN_LOWERING_LOWER_TO_LLVM_H_ diff --git a/toolchain/lower/testdata/BUILD b/toolchain/lowering/testdata/BUILD similarity index 100% rename from toolchain/lower/testdata/BUILD rename to toolchain/lowering/testdata/BUILD diff --git a/toolchain/lowering/testdata/basics/empty.carbon b/toolchain/lowering/testdata/basics/empty.carbon new file mode 100644 index 000000000000..aa9213f02054 --- /dev/null +++ b/toolchain/lowering/testdata/basics/empty.carbon @@ -0,0 +1,8 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE +// RUN: %{carbon-run-lowering} +// CHECK:STDOUT: ; ModuleID = '{{.*}}/toolchain/lowering/testdata/basics/empty.carbon' +// CHECK:STDOUT: source_filename = "{{.*}}/toolchain/lowering/testdata/basics/empty.carbon" diff --git a/toolchain/lower/testdata/lit.cfg.py b/toolchain/lowering/testdata/lit.cfg.py similarity index 100% rename from toolchain/lower/testdata/lit.cfg.py rename to toolchain/lowering/testdata/lit.cfg.py