Moved VectorOps to Vector

PiperOrigin-RevId: 301751648
Change-Id: I8e95ed1be7d0e58d897760aa3060eeb4abc6227c
This commit is contained in:
A. Unique TensorFlower 2020-03-19 00:01:30 -07:00 committed by TensorFlower Gardener
parent 9be4c7d4e7
commit 8b219365eb
20 changed files with 115 additions and 68 deletions

View File

@ -44,8 +44,8 @@ limitations under the License.
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/raw_ostream.h"
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/StandardOps/IR/Ops.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/Builders.h" // TF:llvm-project

View File

@ -41,7 +41,7 @@ limitations under the License.
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/ToolOutputFile.h"
#include "mlir/Dialect/QuantOps/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/StandardOps/IR/Ops.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/Builders.h" // TF:llvm-project

View File

@ -18,7 +18,7 @@ limitations under the License.
#ifndef TENSORFLOW_COMPILER_MLIR_LITE_IR_TFL_OPS_H_
#define TENSORFLOW_COMPILER_MLIR_LITE_IR_TFL_OPS_H_
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Traits.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/Builders.h" // TF:llvm-project

View File

@ -23,8 +23,8 @@ limitations under the License.
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Support/Regex.h"
#include "llvm/Support/raw_ostream.h"
#include "mlir/Dialect/QuantOps/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/StandardOps/IR/Ops.h" // TF:llvm-project
#include "mlir/IR/AffineExpr.h" // TF:llvm-project
#include "mlir/IR/AffineMap.h" // TF:llvm-project

View File

@ -15,7 +15,7 @@ limitations under the License.
#include "tensorflow/compiler/mlir/lite/quantization/lite/tfl_to_std.h"
#include "llvm/Support/Casting.h"
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "tensorflow/compiler/mlir/lite/ir/tfl_ops.h"
namespace mlir {

View File

@ -20,7 +20,7 @@ limitations under the License.
#define TF_Quantization
include "mlir/IR/OpBase.td"
include "mlir/Dialect/QuantOps/QuantOpsBase.td"
include "mlir/Dialect/Quant/QuantOpsBase.td"
//===----------------------------------------------------------------------===//
// QuantizedType definitions.

View File

@ -24,8 +24,8 @@ limitations under the License.
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/StandardOps/IR/Ops.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/Builders.h" // TF:llvm-project

View File

@ -18,7 +18,7 @@ limitations under the License.
#ifndef TENSORFLOW_COMPILER_MLIR_LITE_QUANTIZATION_QUANTIZATION_TRAITS_H_
#define TENSORFLOW_COMPILER_MLIR_LITE_QUANTIZATION_QUANTIZATION_TRAITS_H_
#include "mlir/Dialect/QuantOps/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantTypes.h" // TF:llvm-project
#include "mlir/Support/LLVM.h" // TF:llvm-project
namespace mlir {

View File

@ -22,11 +22,11 @@ limitations under the License.
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallVector.h"
#include "mlir/Dialect/QuantOps/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantizeUtils.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/UniformSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantizeUtils.h" // TF:llvm-project
#include "mlir/Dialect/Quant/UniformSupport.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/MLIRContext.h" // TF:llvm-project
#include "mlir/IR/StandardTypes.h" // TF:llvm-project

View File

@ -23,9 +23,9 @@ limitations under the License.
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/raw_ostream.h"
#include "mlir/Dialect/QuantOps/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/Quant/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/StandardOps/IR/Ops.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/BlockAndValueMapping.h" // TF:llvm-project

View File

@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/IR/PatternMatch.h" // TF:llvm-project
#include "mlir/Pass/Pass.h" // TF:llvm-project
#include "tensorflow/compiler/mlir/lite/quantization/quantization_utils.h"

View File

@ -25,7 +25,7 @@ limitations under the License.
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/StandardOps/IR/Ops.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/MLIRContext.h" // TF:llvm-project

View File

@ -25,8 +25,8 @@ limitations under the License.
#include "absl/memory/memory.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringSwitch.h"
#include "mlir/Dialect/QuantOps/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/IR/Location.h" // TF:llvm-project
#include "tensorflow/compiler/mlir/lite/ir/tfl_ops.h"
#include "tensorflow/compiler/mlir/lite/quantization/quantization_utils.h"

View File

@ -28,8 +28,8 @@ limitations under the License.
#include "llvm/ADT/APInt.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringSwitch.h"
#include "mlir/Dialect/QuantOps/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/UniformSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/UniformSupport.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/MLIRContext.h" // TF:llvm-project
#include "mlir/IR/Operation.h" // TF:llvm-project

View File

@ -19,7 +19,7 @@ limitations under the License.
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/None.h"
#include "llvm/ADT/Optional.h"
#include "mlir/Dialect/QuantOps/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/StandardOps/IR/Ops.h" // TF:llvm-project
#include "mlir/IR/Builders.h" // TF:llvm-project
#include "mlir/IR/MLIRContext.h" // TF:llvm-project

View File

@ -22,7 +22,7 @@ limitations under the License.
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/CommandLine.h"
#include "mlir/Dialect/QuantOps/QuantOps.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantOps.h" // TF:llvm-project
#include "mlir/IR/MLIRContext.h" // TF:llvm-project
#include "mlir/IR/PatternMatch.h" // TF:llvm-project
#include "mlir/IR/Value.h" // TF:llvm-project

View File

@ -39,8 +39,8 @@ limitations under the License.
#include "llvm/Support/Casting.h"
#include "llvm/Support/Debug.h"
#include "mlir/Analysis/LoopAnalysis.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/QuantOps/UniformSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/FakeQuantSupport.h" // TF:llvm-project
#include "mlir/Dialect/Quant/UniformSupport.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/MLIRContext.h" // TF:llvm-project
#include "mlir/IR/PatternMatch.h" // TF:llvm-project

View File

@ -19,7 +19,7 @@ limitations under the License.
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/Debug.h"
#include "mlir/Dialect/QuantOps/QuantTypes.h" // TF:llvm-project
#include "mlir/Dialect/Quant/QuantTypes.h" // TF:llvm-project
#include "mlir/IR/Attributes.h" // TF:llvm-project
#include "mlir/IR/Builders.h" // TF:llvm-project
#include "mlir/IR/MLIRContext.h" // TF:llvm-project

View File

@ -597,8 +597,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
)
# Check out LLVM and MLIR from llvm-project.
LLVM_COMMIT = "98369178bc695ba5d64314beb62d5ba5c9f14e2e"
LLVM_SHA256 = "c30eb278889c64e5a57e31d9bad794c6019d5396ce58a6ba874b0e4763f21097"
LLVM_COMMIT = "c5b81466c2bcc194e5563f39f5be3638760b4849"
LLVM_SHA256 = "f623a7e9585e76831abc967547dfbcd5a6ecd148ed5c4e088bdae94dc7d8bda7"
LLVM_URLS = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),
"https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),

119
third_party/mlir/BUILD vendored
View File

@ -406,6 +406,52 @@ cc_library(
],
)
gentbl(
name = "ShapeOpsIncGen",
strip_include_prefix = "include",
tbl_outs = [
(
"-gen-op-decls",
"include/mlir/Dialect/Shape/IR/ShapeOps.h.inc",
),
(
"-gen-op-defs",
"include/mlir/Dialect/Shape/IR/ShapeOps.cpp.inc",
),
(
"-gen-dialect-decls",
"include/mlir/Dialect/Shape/IR/ShapeOpsDialect.h.inc",
),
],
tblgen = ":mlir-tblgen",
td_file = "include/mlir/Dialect/Shape/IR/ShapeOps.td",
td_srcs = [
":StdOpsTdFiles",
],
)
cc_library(
name = "Shape",
srcs = glob(
[
"lib/Dialect/Shape/IR/*.cpp",
],
),
hdrs = glob([
"include/mlir/Dialect/Shape/IR/*.h",
]),
includes = ["include"],
deps = [
":CallOpInterfaces",
":CommonFolders",
":IR",
":ShapeOpsIncGen",
":SideEffects",
":Support",
"@llvm-project//llvm:support",
],
)
cc_library(
name = "StandardOps",
srcs = glob(
@ -439,15 +485,15 @@ cc_library(
name = "VectorOps",
srcs = glob(
[
"lib/Dialect/VectorOps/*.cpp",
"lib/Dialect/VectorOps/*.h",
"lib/Dialect/VectorOps/EDSC/*.cpp",
"lib/Dialect/VectorOps/EDSC/*.h",
"lib/Dialect/Vector/*.cpp",
"lib/Dialect/Vector/*.h",
"lib/Dialect/Vector/EDSC/*.cpp",
"lib/Dialect/Vector/EDSC/*.h",
],
),
hdrs = glob([
"include/mlir/Dialect/VectorOps/*.h",
"include/mlir/Dialect/VectorOps/EDSC/*.h",
"include/mlir/Dialect/Vector/*.h",
"include/mlir/Dialect/Vector/EDSC/*.h",
]),
includes = ["include"],
deps = [
@ -2004,6 +2050,7 @@ cc_library(
":SDBM",
":SPIRVDialect",
":SPIRVLowering",
":Shape",
":StandardOps",
":StandardToSPIRVConversions",
":Transforms",
@ -2256,8 +2303,8 @@ cc_library(
filegroup(
name = "QuantizationOpsTdFiles",
srcs = [
"include/mlir/Dialect/QuantOps/QuantOps.td",
"include/mlir/Dialect/QuantOps/QuantOpsBase.td",
"include/mlir/Dialect/Quant/QuantOps.td",
"include/mlir/Dialect/Quant/QuantOpsBase.td",
"include/mlir/Interfaces/SideEffects.td",
":OpBaseTdFiles",
],
@ -2270,15 +2317,15 @@ gentbl(
tbl_outs = [
(
"-gen-op-decls",
"include/mlir/Dialect/QuantOps/QuantOps.h.inc",
"include/mlir/Dialect/Quant/QuantOps.h.inc",
),
(
"-gen-op-defs",
"include/mlir/Dialect/QuantOps/QuantOps.cpp.inc",
"include/mlir/Dialect/Quant/QuantOps.cpp.inc",
),
(
"-gen-dialect-decls",
"include/mlir/Dialect/QuantOps/QuantOpsDialect.h.inc",
"include/mlir/Dialect/Quant/QuantOpsDialect.h.inc",
),
(
"-gen-op-doc",
@ -2286,7 +2333,7 @@ gentbl(
),
],
tblgen = ":mlir-tblgen",
td_file = "include/mlir/Dialect/QuantOps/QuantOps.td",
td_file = "include/mlir/Dialect/Quant/QuantOps.td",
td_srcs = [
":QuantizationOpsTdFiles",
],
@ -2295,23 +2342,23 @@ gentbl(
cc_library(
name = "QuantOps",
srcs = [
"lib/Dialect/QuantOps/IR/QuantOps.cpp",
"lib/Dialect/QuantOps/IR/QuantTypes.cpp",
"lib/Dialect/QuantOps/IR/TypeDetail.h",
"lib/Dialect/QuantOps/IR/TypeParser.cpp",
"lib/Dialect/QuantOps/Transforms/ConvertConst.cpp",
"lib/Dialect/QuantOps/Transforms/ConvertSimQuant.cpp",
"lib/Dialect/QuantOps/Utils/FakeQuantSupport.cpp",
"lib/Dialect/QuantOps/Utils/QuantizeUtils.cpp",
"lib/Dialect/QuantOps/Utils/UniformSupport.cpp",
"lib/Dialect/Quant/IR/QuantOps.cpp",
"lib/Dialect/Quant/IR/QuantTypes.cpp",
"lib/Dialect/Quant/IR/TypeDetail.h",
"lib/Dialect/Quant/IR/TypeParser.cpp",
"lib/Dialect/Quant/Transforms/ConvertConst.cpp",
"lib/Dialect/Quant/Transforms/ConvertSimQuant.cpp",
"lib/Dialect/Quant/Utils/FakeQuantSupport.cpp",
"lib/Dialect/Quant/Utils/QuantizeUtils.cpp",
"lib/Dialect/Quant/Utils/UniformSupport.cpp",
],
hdrs = [
"include/mlir/Dialect/QuantOps/FakeQuantSupport.h",
"include/mlir/Dialect/QuantOps/Passes.h",
"include/mlir/Dialect/QuantOps/QuantOps.h",
"include/mlir/Dialect/QuantOps/QuantTypes.h",
"include/mlir/Dialect/QuantOps/QuantizeUtils.h",
"include/mlir/Dialect/QuantOps/UniformSupport.h",
"include/mlir/Dialect/Quant/FakeQuantSupport.h",
"include/mlir/Dialect/Quant/Passes.h",
"include/mlir/Dialect/Quant/QuantOps.h",
"include/mlir/Dialect/Quant/QuantTypes.h",
"include/mlir/Dialect/Quant/QuantizeUtils.h",
"include/mlir/Dialect/Quant/UniformSupport.h",
],
includes = ["include"],
deps = [
@ -2328,7 +2375,7 @@ filegroup(
name = "FxpMathOpsTdFiles",
srcs = [
"include/mlir/Dialect/FxpMathOps/FxpMathOps.td",
"include/mlir/Dialect/QuantOps/QuantOpsBase.td",
"include/mlir/Dialect/Quant/QuantOpsBase.td",
"include/mlir/Interfaces/SideEffects.td",
":OpBaseTdFiles",
],
@ -2681,7 +2728,7 @@ cc_library(
filegroup(
name = "VectorOpsTdFiles",
srcs = [
"include/mlir/Dialect/VectorOps/VectorOps.td",
"include/mlir/Dialect/Vector/VectorOps.td",
":AffineOpsTdFiles",
":OpBaseTdFiles",
],
@ -2693,15 +2740,15 @@ gentbl(
tbl_outs = [
(
"-gen-op-decls",
"include/mlir/Dialect/VectorOps/VectorOps.h.inc",
"include/mlir/Dialect/Vector/VectorOps.h.inc",
),
(
"-gen-op-defs",
"include/mlir/Dialect/VectorOps/VectorOps.cpp.inc",
"include/mlir/Dialect/Vector/VectorOps.cpp.inc",
),
(
"-gen-dialect-decls -dialect=vector",
"include/mlir/Dialect/VectorOps/VectorOpsDialect.h.inc",
"include/mlir/Dialect/Vector/VectorOpsDialect.h.inc",
),
(
"-gen-op-doc",
@ -2709,7 +2756,7 @@ gentbl(
),
],
tblgen = ":mlir-tblgen",
td_file = "include/mlir/Dialect/VectorOps/VectorOps.td",
td_file = "include/mlir/Dialect/Vector/VectorOps.td",
td_srcs = [
":VectorOpsTdFiles",
],
@ -2718,7 +2765,7 @@ gentbl(
filegroup(
name = "VectorTransformPatternsTdFiles",
srcs = [
"include/mlir/Dialect/VectorOps/VectorTransformPatterns.td",
"include/mlir/Dialect/Vector/VectorTransformPatterns.td",
":AffineOpsTdFiles",
":LinalgOpsTdFiles",
":LinalgStructuredOpsTdFiles",
@ -2733,11 +2780,11 @@ gentbl(
tbl_outs = [
(
"-gen-rewriters",
"include/mlir/Dialect/VectorOps/VectorTransformPatterns.h.inc",
"include/mlir/Dialect/Vector/VectorTransformPatterns.h.inc",
),
],
tblgen = ":mlir-tblgen",
td_file = "include/mlir/Dialect/VectorOps/VectorTransformPatterns.td",
td_file = "include/mlir/Dialect/Vector/VectorTransformPatterns.td",
td_srcs = [
":VectorTransformPatternsTdFiles",
],